summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-09-18 16:45:57 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-09-18 17:00:31 +0200
commit8474caddccedcbf6da59f3ed3bc5c4d9442f8e5d (patch)
tree073a1a0ea5bfc824448e75a24f8281b9e7ed7b01
parentMerge tag 'v3.11' into next (diff)
downloadlinux-8474caddccedcbf6da59f3ed3bc5c4d9442f8e5d.tar.xz
linux-8474caddccedcbf6da59f3ed3bc5c4d9442f8e5d.zip
Input: cyttsp4_core - remove redundant dev_set_drvdata
Driver core sets the data to NULL upon release or probe failure. Hence explicit setting is not necessary. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r--drivers/input/touchscreen/cyttsp4_core.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/input/touchscreen/cyttsp4_core.c b/drivers/input/touchscreen/cyttsp4_core.c
index d038575f49db..42d830efa316 100644
--- a/drivers/input/touchscreen/cyttsp4_core.c
+++ b/drivers/input/touchscreen/cyttsp4_core.c
@@ -2113,7 +2113,6 @@ error_startup:
error_request_irq:
if (cd->cpdata->init)
cd->cpdata->init(cd->cpdata, 0, dev);
- dev_set_drvdata(dev, NULL);
error_free_xfer:
kfree(cd->xfer_buf);
error_free_cd:
@@ -2151,7 +2150,6 @@ int cyttsp4_remove(struct cyttsp4 *cd)
free_irq(cd->irq, cd);
if (cd->cpdata->init)
cd->cpdata->init(cd->cpdata, 0, dev);
- dev_set_drvdata(dev, NULL);
cyttsp4_free_si_ptrs(cd);
kfree(cd);
return 0;