diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-19 17:09:42 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-19 17:09:42 +0000 |
| commit | 09a0ae59e314b16d53315df4971a7fdcca4debd0 (patch) | |
| tree | a90682b89dee215c5670c1bf4549f260940700cc /drivers | |
| parent | 2ea425c539200e8eb6fa7ec9e1745ab3321e7cc0 (diff) | |
tracking-2.6.26-rc1-remove-input-dev-private-member.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/keyboard/neo1973kbd.c | 1 | ||||
| -rw-r--r-- | drivers/input/keyboard/qt2410kbd.c | 1 | ||||
| -rw-r--r-- | drivers/input/misc/lis302dl.c | 6 | ||||
| -rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/drivers/input/keyboard/neo1973kbd.c b/drivers/input/keyboard/neo1973kbd.c index 6fc3ac165b6..d22f3771b39 100644 --- a/drivers/input/keyboard/neo1973kbd.c +++ b/drivers/input/keyboard/neo1973kbd.c @@ -199,7 +199,6 @@ static int neo1973kbd_probe(struct platform_device *pdev) input_dev->id.vendor = 0x0001; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->private = neo1973kbd; input_dev->evbit[0] = BIT(EV_KEY) | BIT(EV_SW); set_bit(SW_HEADPHONE_INSERT, input_dev->swbit); diff --git a/drivers/input/keyboard/qt2410kbd.c b/drivers/input/keyboard/qt2410kbd.c index cd8d7c6619b..95392cc9029 100644 --- a/drivers/input/keyboard/qt2410kbd.c +++ b/drivers/input/keyboard/qt2410kbd.c @@ -124,7 +124,6 @@ static int gta01kbd_probe(struct platform_device *pdev) input_dev->id.vendor = 0x0001; input_dev->id.product = 0x0001; input_dev->id.version = 0x0100; - input_dev->private = gta01kbd; input_dev->evbit[0] = BIT(EV_KEY); #if 0 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 */ diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 68071c28f57..bc6ccc213f6 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c @@ -277,7 +277,6 @@ static int __init s3c2410ts_probe(struct platform_device *pdev) input_set_abs_params(ts.dev, ABS_Y, 0, 0x3FF, 0, 0); input_set_abs_params(ts.dev, ABS_PRESSURE, 0, 1, 0, 0); - ts.dev->private = &ts; ts.dev->name = s3c2410ts_name; ts.dev->id.bustype = BUS_RS232; ts.dev->id.vendor = 0xDEAD; |