]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
rtc: rtc-mxc: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Wed, 3 Jul 2013 22:06:30 +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-mxc.c

index bf00d6dbeadd577c45374895cfabf8d437f8560a..ab87bacb8f880b69f01182c44d7d5cf6522c24e6 100644 (file)
@@ -443,15 +443,13 @@ static int mxc_rtc_probe(struct platform_device *pdev)
                                  THIS_MODULE);
        if (IS_ERR(rtc)) {
                ret = PTR_ERR(rtc);
-               goto exit_clr_drvdata;
+               goto exit_put_clk;
        }
 
        pdata->rtc = rtc;
 
        return 0;
 
-exit_clr_drvdata:
-       platform_set_drvdata(pdev, NULL);
 exit_put_clk:
        clk_disable_unprepare(pdata->clk);
 
@@ -465,7 +463,6 @@ static int mxc_rtc_remove(struct platform_device *pdev)
        struct rtc_plat_data *pdata = platform_get_drvdata(pdev);
 
        clk_disable_unprepare(pdata->clk);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }