Merge tag 'xfs-5.4-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

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

diff --git a/drivers/rtc/rtc-sunxi.c b/drivers/rtc/rtc-sunxi.c
index 6eeabb81106fa3f021c05b9fd867d3cdd6fd5cd2..9b6f2483c1c6ac9d40f082ea1e850592f2fb2344 100644 (file)
--- a/drivers/rtc/rtc-sunxi.c
+++ b/drivers/rtc/rtc-sunxi.c
@@ -442,10 +442,8 @@ static int sunxi_rtc_probe(struct platform_device *pdev)
                return PTR_ERR(chip->base);
 
        chip->irq = platform_get_irq(pdev, 0);
-       if (chip->irq < 0) {
-               dev_err(&pdev->dev, "No IRQ resource\n");
+       if (chip->irq < 0)
                return chip->irq;
-       }
        ret = devm_request_irq(&pdev->dev, chip->irq, sunxi_rtc_alarmirq,
                        0, dev_name(&pdev->dev), chip);
        if (ret) {
@@ -474,15 +472,7 @@ static int sunxi_rtc_probe(struct platform_device *pdev)
 
        chip->rtc->ops = &sunxi_rtc_ops;
 
-       ret = rtc_register_device(chip->rtc);
-       if (ret) {
-               dev_err(&pdev->dev, "unable to register device\n");
-               return ret;
-       }
-
-       dev_info(&pdev->dev, "RTC enabled\n");
-
-       return 0;
+       return rtc_register_device(chip->rtc);
 }
 
 static struct platform_driver sunxi_rtc_driver = {