rtc: rtc-sa1100: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Wed, 3 Jul 2013 22:06:35 +0000 (15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 23:07:51 +0000 (16:07 -0700)
The driver core clears the driver data to NULL after device_release or
on probe failure, since commit 0998d063100 ("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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/rtc/rtc-sa1100.c

index 00605601dbf7eb53d874973eb11a6031b1273e58..0f7adeb1944a8f1acd93cae653a4af6c709380b9 100644 (file)
@@ -249,7 +249,7 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
 
        ret = clk_prepare_enable(info->clk);
        if (ret)
-               goto err_enable_clk;
+               return ret;
        /*
         * According to the manual we should be able to let RTTR be zero
         * and then a default diviser for a 32.768KHz clock is used.
@@ -303,8 +303,6 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
        return 0;
 err_dev:
        clk_disable_unprepare(info->clk);
-err_enable_clk:
-       platform_set_drvdata(pdev, NULL);
        return ret;
 }
 
@@ -312,10 +310,8 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
 {
        struct sa1100_rtc *info = platform_get_drvdata(pdev);
 
-       if (info) {
+       if (info)
                clk_disable_unprepare(info->clk);
-               platform_set_drvdata(pdev, NULL);
-       }
 
        return 0;
 }