aboutsummaryrefslogtreecommitdiff
path: root/drivers/input/misc/lis302dl.c
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2008-11-19 17:09:42 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2008-11-19 17:09:42 +0000
commit09a0ae59e314b16d53315df4971a7fdcca4debd0 (patch)
treea90682b89dee215c5670c1bf4549f260940700cc /drivers/input/misc/lis302dl.c
parent2ea425c539200e8eb6fa7ec9e1745ab3321e7cc0 (diff)
tracking-2.6.26-rc1-remove-input-dev-private-member.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/input/misc/lis302dl.c')
-rw-r--r--drivers/input/misc/lis302dl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/lis302dl.c b/drivers/input/misc/lis302dl.c
index 6067dba75d5..1d19418caa5 100644
--- a/drivers/input/misc/lis302dl.c
+++ b/drivers/input/misc/lis302dl.c
@@ -236,7 +236,7 @@ static struct attribute_group lis302dl_attr_group = {
static int lis302dl_input_open(struct input_dev *inp)
{
- struct lis302dl_info *lis = inp->private;
+ struct lis302dl_info *lis = input_get_drvdata(inp);
u_int8_t ctrl1 = LIS302DL_CTRL1_PD | LIS302DL_CTRL1_Xen |
LIS302DL_CTRL1_Yen | LIS302DL_CTRL1_Zen;
unsigned long flags;
@@ -255,7 +255,7 @@ static int lis302dl_input_open(struct input_dev *inp)
static void lis302dl_input_close(struct input_dev *inp)
{
- struct lis302dl_info *lis = inp->private;
+ struct lis302dl_info *lis = input_get_drvdata(inp);
u_int8_t ctrl1 = LIS302DL_CTRL1_Xen | LIS302DL_CTRL1_Yen |
LIS302DL_CTRL1_Zen;
unsigned long flags;
@@ -334,7 +334,7 @@ static int __devinit lis302dl_probe(struct spi_device *spi)
set_bit(BTN_Y, lis->input_dev->keybit);
set_bit(BTN_Z, lis->input_dev->keybit);
*/
- lis->input_dev->private = lis;
+ input_set_drvdata(lis->input_dev, lis);
lis->input_dev->name = pdata->name;
/* SPI Bus not defined as a valid bus for input subsystem*/
lis->input_dev->id.bustype = BUS_I2C; /* lie about it */