aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-06 10:38:51 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-05-08 12:05:00 -0400
commit86066e6839820b7808b013bac16348b7b1ad8bae (patch)
tree2febc16ac4182a97a7b6171d51563f435720ddea
parent413b859e16282c32a3f3edbeeeea9ca440023194 (diff)
Input: sh_keysc - 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> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/keyboard/sh_keysc.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index fdb9eb2df380..fe0e498d2479 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -266,7 +266,6 @@ static int sh_keysc_probe(struct platform_device *pdev)
266 err2: 266 err2:
267 iounmap(priv->iomem_base); 267 iounmap(priv->iomem_base);
268 err1: 268 err1:
269 platform_set_drvdata(pdev, NULL);
270 kfree(priv); 269 kfree(priv);
271 err0: 270 err0:
272 return error; 271 return error;
@@ -285,7 +284,6 @@ static int sh_keysc_remove(struct platform_device *pdev)
285 pm_runtime_put_sync(&pdev->dev); 284 pm_runtime_put_sync(&pdev->dev);
286 pm_runtime_disable(&pdev->dev); 285 pm_runtime_disable(&pdev->dev);
287 286
288 platform_set_drvdata(pdev, NULL);
289 kfree(priv); 287 kfree(priv);
290 288
291 return 0; 289 return 0;