diff options
author | Sachin Kamat <sachin.kamat@linaro.org> | 2013-05-05 22:38:03 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-05-05 23:14:38 -0400 |
commit | 7f1f5d13ef9b9a3af81e2001938bcb377436915d (patch) | |
tree | 32acb81f4a5ddc8ef2fa0f259aca6f182c1cb4c0 /drivers/input/touchscreen | |
parent | 602b6a02cad6a6473668c5a0176a247e5bc6648a (diff) |
Input: atmel-wm97xx - remove redundant platform_set_drvdata()
Commit 0998d06310 (device-core: Ensure drvdata = NULL when no
driver is bound) removes the need to set driver data field to
NULL.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r-- | drivers/input/touchscreen/atmel-wm97xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index 2c1e46b7e45b..268a35e55d7f 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c | |||
@@ -372,7 +372,6 @@ static int __init atmel_wm97xx_probe(struct platform_device *pdev) | |||
372 | err_irq: | 372 | err_irq: |
373 | free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); | 373 | free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); |
374 | err: | 374 | err: |
375 | platform_set_drvdata(pdev, NULL); | ||
376 | kfree(atmel_wm97xx); | 375 | kfree(atmel_wm97xx); |
377 | return ret; | 376 | return ret; |
378 | } | 377 | } |
@@ -386,7 +385,6 @@ static int __exit atmel_wm97xx_remove(struct platform_device *pdev) | |||
386 | free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); | 385 | free_irq(atmel_wm97xx->ac97c_irq, atmel_wm97xx); |
387 | del_timer_sync(&atmel_wm97xx->pen_timer); | 386 | del_timer_sync(&atmel_wm97xx->pen_timer); |
388 | wm97xx_unregister_mach_ops(wm); | 387 | wm97xx_unregister_mach_ops(wm); |
389 | platform_set_drvdata(pdev, NULL); | ||
390 | kfree(atmel_wm97xx); | 388 | kfree(atmel_wm97xx); |
391 | 389 | ||
392 | return 0; | 390 | return 0; |