diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-05-07 01:32:11 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-16 21:11:13 -0400 |
commit | 87f0a427547d8552f87bfb19baa3d66d528aa761 (patch) | |
tree | 9913d74bea322c4dbd78d6b227b87278dad20b9d | |
parent | 21b066f19a81bd2af496745796914cfeca7a8ea7 (diff) |
misc: arm-charlcd: remove unnecessary platform_set_drvdata()
The driver core clears the driver data to NULL after device_release
or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d
(device-core: Ensure drvdata = NULL when no driver is bound).
Thus, it is not needed to manually clear the device driver data to NULL.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/misc/arm-charlcd.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/misc/arm-charlcd.c b/drivers/misc/arm-charlcd.c index 48651ef0028c..1256a4bf1c04 100644 --- a/drivers/misc/arm-charlcd.c +++ b/drivers/misc/arm-charlcd.c | |||
@@ -291,7 +291,7 @@ static int __init charlcd_probe(struct platform_device *pdev) | |||
291 | lcd->virtbase = ioremap(lcd->phybase, lcd->physize); | 291 | lcd->virtbase = ioremap(lcd->phybase, lcd->physize); |
292 | if (!lcd->virtbase) { | 292 | if (!lcd->virtbase) { |
293 | ret = -ENOMEM; | 293 | ret = -ENOMEM; |
294 | goto out_no_remap; | 294 | goto out_no_memregion; |
295 | } | 295 | } |
296 | 296 | ||
297 | lcd->irq = platform_get_irq(pdev, 0); | 297 | lcd->irq = platform_get_irq(pdev, 0); |
@@ -320,8 +320,6 @@ static int __init charlcd_probe(struct platform_device *pdev) | |||
320 | 320 | ||
321 | out_no_irq: | 321 | out_no_irq: |
322 | iounmap(lcd->virtbase); | 322 | iounmap(lcd->virtbase); |
323 | out_no_remap: | ||
324 | platform_set_drvdata(pdev, NULL); | ||
325 | out_no_memregion: | 323 | out_no_memregion: |
326 | release_mem_region(lcd->phybase, SZ_4K); | 324 | release_mem_region(lcd->phybase, SZ_4K); |
327 | out_no_resource: | 325 | out_no_resource: |
@@ -337,7 +335,6 @@ static int __exit charlcd_remove(struct platform_device *pdev) | |||
337 | free_irq(lcd->irq, lcd); | 335 | free_irq(lcd->irq, lcd); |
338 | iounmap(lcd->virtbase); | 336 | iounmap(lcd->virtbase); |
339 | release_mem_region(lcd->phybase, lcd->physize); | 337 | release_mem_region(lcd->phybase, lcd->physize); |
340 | platform_set_drvdata(pdev, NULL); | ||
341 | kfree(lcd); | 338 | kfree(lcd); |
342 | } | 339 | } |
343 | 340 | ||