Merge tag 'iomap-5.4-merge-6' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

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

diff --git a/drivers/rtc/rtc-aspeed.c b/drivers/rtc/rtc-aspeed.c
index af3eb676d7c32d122ce4400bb64db82986d3b446..e351d35b29a3ada596071ab0bfd04c38752aec77 100644 (file)
--- a/drivers/rtc/rtc-aspeed.c
+++ b/drivers/rtc/rtc-aspeed.c
@@ -86,7 +86,6 @@ static int aspeed_rtc_probe(struct platform_device *pdev)
 {
        struct aspeed_rtc *rtc;
        struct resource *res;
-       int ret;
 
        rtc = devm_kzalloc(&pdev->dev, sizeof(*rtc), GFP_KERNEL);
        if (!rtc)
@@ -107,11 +106,7 @@ static int aspeed_rtc_probe(struct platform_device *pdev)
        rtc->rtc_dev->range_min = RTC_TIMESTAMP_BEGIN_1900;
        rtc->rtc_dev->range_max = 38814989399LL; /* 3199-12-31 23:59:59 */
 
-       ret = rtc_register_device(rtc->rtc_dev);
-       if (ret)
-               return ret;
-
-       return 0;
+       return rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id aspeed_rtc_match[] = {