rtc: rtc-msm6242: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Wed, 3 Jul 2013 22:06:29 +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-msm6242.c

index f0e9893..c014fa2 100644 (file)
@@ -199,7 +199,6 @@ static int __init msm6242_rtc_probe(struct platform_device *pdev)
        struct resource *res;
        struct msm6242_priv *priv;
        struct rtc_device *rtc;
-       int error;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res)
@@ -216,17 +215,11 @@ static int __init msm6242_rtc_probe(struct platform_device *pdev)
 
        rtc = devm_rtc_device_register(&pdev->dev, "rtc-msm6242",
                                &msm6242_rtc_ops, THIS_MODULE);
-       if (IS_ERR(rtc)) {
-               error = PTR_ERR(rtc);
-               goto out_unmap;
-       }
+       if (IS_ERR(rtc))
+               return PTR_ERR(rtc);
 
        priv->rtc = rtc;
        return 0;
-
-out_unmap:
-       platform_set_drvdata(pdev, NULL);
-       return error;
 }
 
 static int __exit msm6242_rtc_remove(struct platform_device *pdev)