]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
rtc: rtc-max8925: remove unnecessary platform_set_drvdata()
authorJingoo Han <jg1.han@samsung.com>
Fri, 7 Jun 2013 00:09:01 +0000 (10:09 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Jun 2013 05:42:54 +0000 (15:42 +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-max8925.c

index 7c90f4e45e27b07eb836f06009e9a605266f4988..981b6544cf7ccd99af5b6f0a6bfbe6af6ee1b2cf 100644 (file)
@@ -268,7 +268,7 @@ static int max8925_rtc_probe(struct platform_device *pdev)
        if (ret < 0) {
                dev_err(chip->dev, "Failed to request IRQ: #%d: %d\n",
                        info->irq, ret);
-               goto err;
+               return ret;
        }
 
        dev_set_drvdata(&pdev->dev, info);
@@ -282,13 +282,10 @@ static int max8925_rtc_probe(struct platform_device *pdev)
        ret = PTR_ERR(info->rtc_dev);
        if (IS_ERR(info->rtc_dev)) {
                dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-               goto err;
+               return ret;
        }
 
        return 0;
-err:
-       platform_set_drvdata(pdev, NULL);
-       return ret;
 }
 
 static int max8925_rtc_remove(struct platform_device *pdev)