summaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-06 16:37:10 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-05-08 18:04:59 +0200
commit413b859e16282c32a3f3edbeeeea9ca440023194 (patch)
tree5e40f0204357843c884c157ba33327748241d02c /drivers/input/keyboard
parentInput: pxa930_rotary - remove redundant platform_set_drvdata() (diff)
downloadlinux-413b859e16282c32a3f3edbeeeea9ca440023194.tar.xz
linux-413b859e16282c32a3f3edbeeeea9ca440023194.zip
Input: samsung-keypad - 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> Cc: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/keyboard')
-rw-r--r--drivers/input/keyboard/samsung-keypad.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/samsung-keypad.c b/drivers/input/keyboard/samsung-keypad.c
index 22e357b51024..7b938b481bd5 100644
--- a/drivers/input/keyboard/samsung-keypad.c
+++ b/drivers/input/keyboard/samsung-keypad.c
@@ -487,7 +487,6 @@ static int samsung_keypad_probe(struct platform_device *pdev)
err_disable_runtime_pm:
pm_runtime_disable(&pdev->dev);
device_init_wakeup(&pdev->dev, 0);
- platform_set_drvdata(pdev, NULL);
err_unprepare_clk:
clk_unprepare(keypad->clk);
return error;
@@ -499,7 +498,6 @@ static int samsung_keypad_remove(struct platform_device *pdev)
pm_runtime_disable(&pdev->dev);
device_init_wakeup(&pdev->dev, 0);
- platform_set_drvdata(pdev, NULL);
input_unregister_device(keypad->input_dev);