Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-da9052.c

diff --git a/drivers/rtc/rtc-da9052.c b/drivers/rtc/rtc-da9052.c
index a61ab7fa8a6606689cbb8cfa69bb5a5ebed68811..9c8c19441cc65211a0c3dbd63a5147ea6e7ff8b0 100644 (file)
--- a/drivers/rtc/rtc-da9052.c
+++ b/drivers/rtc/rtc-da9052.c
@@ -15,6 +15,7 @@
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/rtc.h>
+#include <linux/err.h>
 
 #include <linux/mfd/da9052/da9052.h>
 #include <linux/mfd/da9052/reg.h>
@@ -249,20 +250,11 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 
        rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
                                       &da9052_rtc_ops, THIS_MODULE);
-       if (IS_ERR(rtc->rtc))
-               return PTR_ERR(rtc->rtc);
-
-       return 0;
-}
-
-static int da9052_rtc_remove(struct platform_device *pdev)
-{
-       return 0;
+       return PTR_RET(rtc->rtc);
 }
 
 static struct platform_driver da9052_rtc_driver = {
        .probe  = da9052_rtc_probe,
-       .remove = da9052_rtc_remove,
        .driver = {
                .name   = "da9052-rtc",
                .owner  = THIS_MODULE,