]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-max8998: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Thu, 9 May 2013 23:57:42 +0000 (09:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 21 May 2013 04:17:55 +0000 (14:17 +1000)
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>
drivers/rtc/rtc-max8998.c

index 48b6612fae7fb59b13804972e2709884f79da92a..b93842d7fd0021373187c0920c60831547e46ce5 100644 (file)
@@ -274,7 +274,7 @@ static int max8998_rtc_probe(struct platform_device *pdev)
        if (IS_ERR(info->rtc_dev)) {
                ret = PTR_ERR(info->rtc_dev);
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-               goto out_rtc;
+               return ret;
        }
 
        ret = devm_request_threaded_irq(&pdev->dev, info->irq, NULL,
@@ -292,10 +292,6 @@ static int max8998_rtc_probe(struct platform_device *pdev)
        }
 
        return 0;
-
-out_rtc:
-       platform_set_drvdata(pdev, NULL);
-       return ret;
 }
 
 static int max8998_rtc_remove(struct platform_device *pdev)