summaryrefslogtreecommitdiffstats
path: root/drivers/media/rc
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-05-13 04:24:08 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-05-27 08:30:59 -0400
commitd78fe0877867258ac422bc851ee3110f679e1246 (patch)
tree8302df7ba3024dc41bd7fbb826ebcdbc96b3d992 /drivers/media/rc
parenta0c6ae257e416e5cdf7018223500d327d58da2d7 (diff)
[media] rc: gpio-ir-recv: 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: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/rc')
-rw-r--r--drivers/media/rc/gpio-ir-recv.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/rc/gpio-ir-recv.c b/drivers/media/rc/gpio-ir-recv.c
index 8b82ae9bd686..07aacfa5903d 100644
--- a/drivers/media/rc/gpio-ir-recv.c
+++ b/drivers/media/rc/gpio-ir-recv.c
@@ -178,7 +178,6 @@ static int gpio_ir_recv_probe(struct platform_device *pdev)
178 return 0; 178 return 0;
179 179
180err_request_irq: 180err_request_irq:
181 platform_set_drvdata(pdev, NULL);
182 rc_unregister_device(rcdev); 181 rc_unregister_device(rcdev);
183 rcdev = NULL; 182 rcdev = NULL;
184err_register_rc_device: 183err_register_rc_device:
@@ -196,7 +195,6 @@ static int gpio_ir_recv_remove(struct platform_device *pdev)
196 struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev); 195 struct gpio_rc_dev *gpio_dev = platform_get_drvdata(pdev);
197 196
198 free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev); 197 free_irq(gpio_to_irq(gpio_dev->gpio_nr), gpio_dev);
199 platform_set_drvdata(pdev, NULL);
200 rc_unregister_device(gpio_dev->rcdev); 198 rc_unregister_device(gpio_dev->rcdev);
201 gpio_free(gpio_dev->gpio_nr); 199 gpio_free(gpio_dev->gpio_nr);
202 kfree(gpio_dev); 200 kfree(gpio_dev);