diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-06-30 18:07:09 -0400 |
commit | 08fa16b6b75005c120b59d00ae42a0b7cc68db45 (patch) | |
tree | c5f22412467f72dd0c7291bbb958a9485e894f02 /drivers/input | |
parent | 1796b983cc4cbbed5e9e478b03591609a2c21987 (diff) | |
parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) |
Merge commit 'v2.6.35-rc3' into next
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/keyboard/adp5588-keys.c | 1 | ||||
-rw-r--r-- | drivers/input/keyboard/lm8323.c | 2 | ||||
-rw-r--r-- | drivers/input/keyboard/max7359_keypad.c | 1 | ||||
-rw-r--r-- | drivers/input/keyboard/qt2160.c | 1 | ||||
-rw-r--r-- | drivers/input/keyboard/tca6416-keypad.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/ad714x-i2c.c | 1 | ||||
-rw-r--r-- | drivers/input/misc/hp_sdc_rtc.c | 2 | ||||
-rw-r--r-- | drivers/input/misc/pcf8574_keypad.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/synaptics_i2c.c | 1 | ||||
-rw-r--r-- | drivers/input/serio/Kconfig | 3 | ||||
-rw-r--r-- | drivers/input/touchscreen/ad7879.c | 5 | ||||
-rw-r--r-- | drivers/input/touchscreen/eeti_ts.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/mcs5000_ts.c | 1 | ||||
-rw-r--r-- | drivers/input/touchscreen/tsc2007.c | 2 |
14 files changed, 4 insertions, 22 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 4ef789ef104..9096db73c3c 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c | |||
@@ -407,7 +407,6 @@ static int __devexit adp5588_remove(struct i2c_client *client) | |||
407 | free_irq(client->irq, kpad); | 407 | free_irq(client->irq, kpad); |
408 | cancel_delayed_work_sync(&kpad->work); | 408 | cancel_delayed_work_sync(&kpad->work); |
409 | input_unregister_device(kpad->input); | 409 | input_unregister_device(kpad->input); |
410 | i2c_set_clientdata(client, NULL); | ||
411 | kfree(kpad); | 410 | kfree(kpad); |
412 | 411 | ||
413 | return 0; | 412 | return 0; |
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c index 6ecd37a845f..f7c2a166576 100644 --- a/drivers/input/keyboard/lm8323.c +++ b/drivers/input/keyboard/lm8323.c | |||
@@ -780,8 +780,6 @@ static int __devexit lm8323_remove(struct i2c_client *client) | |||
780 | struct lm8323_chip *lm = i2c_get_clientdata(client); | 780 | struct lm8323_chip *lm = i2c_get_clientdata(client); |
781 | int i; | 781 | int i; |
782 | 782 | ||
783 | i2c_set_clientdata(client, NULL); | ||
784 | |||
785 | disable_irq_wake(client->irq); | 783 | disable_irq_wake(client->irq); |
786 | free_irq(client->irq, lm); | 784 | free_irq(client->irq, lm); |
787 | cancel_work_sync(&lm->work); | 785 | cancel_work_sync(&lm->work); |
diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c index 7fc8185e5c1..9091ff5ea80 100644 --- a/drivers/input/keyboard/max7359_keypad.c +++ b/drivers/input/keyboard/max7359_keypad.c | |||
@@ -265,7 +265,6 @@ static int __devexit max7359_remove(struct i2c_client *client) | |||
265 | 265 | ||
266 | free_irq(client->irq, keypad); | 266 | free_irq(client->irq, keypad); |
267 | input_unregister_device(keypad->input_dev); | 267 | input_unregister_device(keypad->input_dev); |
268 | i2c_set_clientdata(client, NULL); | ||
269 | kfree(keypad); | 268 | kfree(keypad); |
270 | 269 | ||
271 | return 0; | 270 | return 0; |
diff --git a/drivers/input/keyboard/qt2160.c b/drivers/input/keyboard/qt2160.c index 31f30087b59..fac695157e8 100644 --- a/drivers/input/keyboard/qt2160.c +++ b/drivers/input/keyboard/qt2160.c | |||
@@ -358,7 +358,6 @@ static int __devexit qt2160_remove(struct i2c_client *client) | |||
358 | input_unregister_device(qt2160->input); | 358 | input_unregister_device(qt2160->input); |
359 | kfree(qt2160); | 359 | kfree(qt2160); |
360 | 360 | ||
361 | i2c_set_clientdata(client, NULL); | ||
362 | return 0; | 361 | return 0; |
363 | } | 362 | } |
364 | 363 | ||
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c index 493c93f25e2..00137bebcf9 100644 --- a/drivers/input/keyboard/tca6416-keypad.c +++ b/drivers/input/keyboard/tca6416-keypad.c | |||
@@ -316,8 +316,6 @@ static int __devexit tca6416_keypad_remove(struct i2c_client *client) | |||
316 | input_unregister_device(chip->input); | 316 | input_unregister_device(chip->input); |
317 | kfree(chip); | 317 | kfree(chip); |
318 | 318 | ||
319 | i2c_set_clientdata(client, NULL); | ||
320 | |||
321 | return 0; | 319 | return 0; |
322 | } | 320 | } |
323 | 321 | ||
diff --git a/drivers/input/misc/ad714x-i2c.c b/drivers/input/misc/ad714x-i2c.c index e9adbe49f6a..2bef8fa56c9 100644 --- a/drivers/input/misc/ad714x-i2c.c +++ b/drivers/input/misc/ad714x-i2c.c | |||
@@ -97,7 +97,6 @@ static int __devexit ad714x_i2c_remove(struct i2c_client *client) | |||
97 | struct ad714x_chip *chip = i2c_get_clientdata(client); | 97 | struct ad714x_chip *chip = i2c_get_clientdata(client); |
98 | 98 | ||
99 | ad714x_remove(chip); | 99 | ad714x_remove(chip); |
100 | i2c_set_clientdata(client, NULL); | ||
101 | 100 | ||
102 | return 0; | 101 | return 0; |
103 | } | 102 | } |
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c index e00a1cc79c0..c1906647905 100644 --- a/drivers/input/misc/hp_sdc_rtc.c +++ b/drivers/input/misc/hp_sdc_rtc.c | |||
@@ -678,7 +678,7 @@ static const struct file_operations hp_sdc_rtc_fops = { | |||
678 | .llseek = no_llseek, | 678 | .llseek = no_llseek, |
679 | .read = hp_sdc_rtc_read, | 679 | .read = hp_sdc_rtc_read, |
680 | .poll = hp_sdc_rtc_poll, | 680 | .poll = hp_sdc_rtc_poll, |
681 | .unlocked_ioctl = hp_sdc_rtc_ioctl, | 681 | .unlocked_ioctl = hp_sdc_rtc_unlocked_ioctl, |
682 | .open = hp_sdc_rtc_open, | 682 | .open = hp_sdc_rtc_open, |
683 | .fasync = hp_sdc_rtc_fasync, | 683 | .fasync = hp_sdc_rtc_fasync, |
684 | }; | 684 | }; |
diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c index 5c3ac4e0b05..0ac47d2898e 100644 --- a/drivers/input/misc/pcf8574_keypad.c +++ b/drivers/input/misc/pcf8574_keypad.c | |||
@@ -168,8 +168,6 @@ static int __devexit pcf8574_kp_remove(struct i2c_client *client) | |||
168 | input_unregister_device(lp->idev); | 168 | input_unregister_device(lp->idev); |
169 | kfree(lp); | 169 | kfree(lp); |
170 | 170 | ||
171 | i2c_set_clientdata(client, NULL); | ||
172 | |||
173 | return 0; | 171 | return 0; |
174 | } | 172 | } |
175 | 173 | ||
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 8291e7399ff..0ae62f0bcb3 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c | |||
@@ -613,7 +613,6 @@ static int __devexit synaptics_i2c_remove(struct i2c_client *client) | |||
613 | free_irq(client->irq, touch); | 613 | free_irq(client->irq, touch); |
614 | 614 | ||
615 | input_unregister_device(touch->input); | 615 | input_unregister_device(touch->input); |
616 | i2c_set_clientdata(client, NULL); | ||
617 | kfree(touch); | 616 | kfree(touch); |
618 | 617 | ||
619 | return 0; | 618 | return 0; |
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig index f34f1dbeb57..3bfe8fafc6a 100644 --- a/drivers/input/serio/Kconfig +++ b/drivers/input/serio/Kconfig | |||
@@ -21,7 +21,8 @@ if SERIO | |||
21 | config SERIO_I8042 | 21 | config SERIO_I8042 |
22 | tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 | 22 | tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86 |
23 | default y | 23 | default y |
24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN | 24 | depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && \ |
25 | (!SUPERH || SH_CAYMAN) && !M68K && !BLACKFIN | ||
25 | help | 26 | help |
26 | i8042 is the chip over which the standard AT keyboard and PS/2 | 27 | i8042 is the chip over which the standard AT keyboard and PS/2 |
27 | mouse are connected to the computer. If you use these devices, | 28 | mouse are connected to the computer. If you use these devices, |
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c index 794d070c690..4b32fb4704c 100644 --- a/drivers/input/touchscreen/ad7879.c +++ b/drivers/input/touchscreen/ad7879.c | |||
@@ -812,10 +812,8 @@ static int __devinit ad7879_probe(struct i2c_client *client, | |||
812 | ts->bus = client; | 812 | ts->bus = client; |
813 | 813 | ||
814 | error = ad7879_construct(client, ts); | 814 | error = ad7879_construct(client, ts); |
815 | if (error) { | 815 | if (error) |
816 | i2c_set_clientdata(client, NULL); | ||
817 | kfree(ts); | 816 | kfree(ts); |
818 | } | ||
819 | 817 | ||
820 | return error; | 818 | return error; |
821 | } | 819 | } |
@@ -825,7 +823,6 @@ static int __devexit ad7879_remove(struct i2c_client *client) | |||
825 | struct ad7879 *ts = dev_get_drvdata(&client->dev); | 823 | struct ad7879 *ts = dev_get_drvdata(&client->dev); |
826 | 824 | ||
827 | ad7879_destroy(client, ts); | 825 | ad7879_destroy(client, ts); |
828 | i2c_set_clientdata(client, NULL); | ||
829 | kfree(ts); | 826 | kfree(ts); |
830 | 827 | ||
831 | return 0; | 828 | return 0; |
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 75f8b73010f..7a3a916f84a 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c | |||
@@ -238,7 +238,6 @@ err2: | |||
238 | input = NULL; /* so we dont try to free it below */ | 238 | input = NULL; /* so we dont try to free it below */ |
239 | err1: | 239 | err1: |
240 | input_free_device(input); | 240 | input_free_device(input); |
241 | i2c_set_clientdata(client, NULL); | ||
242 | kfree(priv); | 241 | kfree(priv); |
243 | err0: | 242 | err0: |
244 | return err; | 243 | return err; |
@@ -256,7 +255,6 @@ static int __devexit eeti_ts_remove(struct i2c_client *client) | |||
256 | enable_irq(priv->irq); | 255 | enable_irq(priv->irq); |
257 | 256 | ||
258 | input_unregister_device(priv->input); | 257 | input_unregister_device(priv->input); |
259 | i2c_set_clientdata(client, NULL); | ||
260 | kfree(priv); | 258 | kfree(priv); |
261 | 259 | ||
262 | return 0; | 260 | return 0; |
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index ce8ab0269f6..1fb0c2f06a4 100644 --- a/drivers/input/touchscreen/mcs5000_ts.c +++ b/drivers/input/touchscreen/mcs5000_ts.c | |||
@@ -256,7 +256,6 @@ static int __devexit mcs5000_ts_remove(struct i2c_client *client) | |||
256 | free_irq(client->irq, data); | 256 | free_irq(client->irq, data); |
257 | input_unregister_device(data->input_dev); | 257 | input_unregister_device(data->input_dev); |
258 | kfree(data); | 258 | kfree(data); |
259 | i2c_set_clientdata(client, NULL); | ||
260 | 259 | ||
261 | return 0; | 260 | return 0; |
262 | } | 261 | } |
diff --git a/drivers/input/touchscreen/tsc2007.c b/drivers/input/touchscreen/tsc2007.c index 769b479fcaa..be23780e8a3 100644 --- a/drivers/input/touchscreen/tsc2007.c +++ b/drivers/input/touchscreen/tsc2007.c | |||
@@ -347,8 +347,6 @@ static int __devexit tsc2007_remove(struct i2c_client *client) | |||
347 | struct tsc2007 *ts = i2c_get_clientdata(client); | 347 | struct tsc2007 *ts = i2c_get_clientdata(client); |
348 | struct tsc2007_platform_data *pdata = client->dev.platform_data; | 348 | struct tsc2007_platform_data *pdata = client->dev.platform_data; |
349 | 349 | ||
350 | i2c_set_clientdata(client, NULL); | ||
351 | |||
352 | tsc2007_free_irq(ts); | 350 | tsc2007_free_irq(ts); |
353 | 351 | ||
354 | if (pdata->exit_platform_hw) | 352 | if (pdata->exit_platform_hw) |