summaryrefslogtreecommitdiffstats
path: root/drivers/misc/arm-charlcd.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-07 07:32:11 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-17 03:11:13 +0200
commit87f0a427547d8552f87bfb19baa3d66d528aa761 (patch)
tree9913d74bea322c4dbd78d6b227b87278dad20b9d /drivers/misc/arm-charlcd.c
parentdrivers: misc: use devm_ioremap_resource() (diff)
downloadlinux-87f0a427547d8552f87bfb19baa3d66d528aa761.tar.xz
linux-87f0a427547d8552f87bfb19baa3d66d528aa761.zip
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>
Diffstat (limited to '')
-rw-r--r--drivers/misc/arm-charlcd.c5
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)
lcd->virtbase = ioremap(lcd->phybase, lcd->physize);
if (!lcd->virtbase) {
ret = -ENOMEM;
- goto out_no_remap;
+ goto out_no_memregion;
}
lcd->irq = platform_get_irq(pdev, 0);
@@ -320,8 +320,6 @@ static int __init charlcd_probe(struct platform_device *pdev)
out_no_irq:
iounmap(lcd->virtbase);
-out_no_remap:
- platform_set_drvdata(pdev, NULL);
out_no_memregion:
release_mem_region(lcd->phybase, SZ_4K);
out_no_resource:
@@ -337,7 +335,6 @@ static int __exit charlcd_remove(struct platform_device *pdev)
free_irq(lcd->irq, lcd);
iounmap(lcd->virtbase);
release_mem_region(lcd->phybase, lcd->physize);
- platform_set_drvdata(pdev, NULL);
kfree(lcd);
}