]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Wed, 3 Jul 2013 22:06:43 +0000 (15:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jul 2013 23:07:52 +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-rp5c01.c

index 873c689f01c36e6f09e7482691d25cfe333d2883..89d073679267eea3b33827b5338e54bdda1656c3 100644 (file)
@@ -251,21 +251,15 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 
        rtc = devm_rtc_device_register(&dev->dev, "rtc-rp5c01", &rp5c01_rtc_ops,
                                  THIS_MODULE);
-       if (IS_ERR(rtc)) {
-               error = PTR_ERR(rtc);
-               goto out;
-       }
+       if (IS_ERR(rtc))
+               return PTR_ERR(rtc);
        priv->rtc = rtc;
 
        error = sysfs_create_bin_file(&dev->dev.kobj, &priv->nvram_attr);
        if (error)
-               goto out;
+               return error;
 
        return 0;
-
-out:
-       platform_set_drvdata(dev, NULL);
-       return error;
 }
 
 static int __exit rp5c01_rtc_remove(struct platform_device *dev)