OSDN Git Service

misc: arm-charlcd: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Tue, 7 May 2013 05:32:11 +0000 (14:32 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 May 2013 01:11:13 +0000 (18:11 -0700)
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>
drivers/misc/arm-charlcd.c

index 48651ef..1256a4b 100644 (file)
@@ -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);
        }