Merge tag 'ceph-for-5.4-rc1' of git://github.com/ceph/ceph-client

[linux.git] / drivers / rtc / rtc-armada38x.c

diff --git a/drivers/rtc/rtc-armada38x.c b/drivers/rtc/rtc-armada38x.c
index 8e8b8079b60a7fd14b221f62b6360774930d0ab7..9351bd52477e93c96a279012d575050ea87907f6 100644 (file)
--- a/drivers/rtc/rtc-armada38x.c
+++ b/drivers/rtc/rtc-armada38x.c
@@ -502,7 +502,6 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
        struct resource *res;
        struct armada38x_rtc *rtc;
        const struct of_device_id *match;
-       int ret;
 
        match = of_match_device(armada38x_rtc_of_match_table, &pdev->dev);
        if (!match)
@@ -561,11 +560,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
 
        rtc->rtc_dev->range_max = U32_MAX;
 
-       ret = rtc_register_device(rtc->rtc_dev);
-       if (ret)
-               dev_err(&pdev->dev, "Failed to register RTC device: %d\n", ret);
-
-       return ret;
+       return rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP