Merge tag 'for-5.4/dm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/device...

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

diff --git a/drivers/rtc/rtc-sc27xx.c b/drivers/rtc/rtc-sc27xx.c
index b4eb3b3c6c2cb810ce300939d03d6d0fa82bd3f0..b956768997508f96449fada3250d7b4dde381dae 100644 (file)
--- a/drivers/rtc/rtc-sc27xx.c
+++ b/drivers/rtc/rtc-sc27xx.c
@@ -138,7 +138,7 @@ static int sprd_rtc_lock_alarm(struct sprd_rtc *rtc, bool lock)
        if (ret)
                return ret;
 
-       val &= ~(SPRD_RTC_ALMLOCK_MASK | SPRD_RTC_POWEROFF_ALM_FLAG);
+       val &= ~SPRD_RTC_ALMLOCK_MASK;
        if (lock)
                val |= SPRD_RTC_ALM_LOCK;
        else
@@ -614,10 +614,8 @@ static int sprd_rtc_probe(struct platform_device *pdev)
        }
 
        rtc->irq = platform_get_irq(pdev, 0);
-       if (rtc->irq < 0) {
-               dev_err(&pdev->dev, "failed to get RTC irq number\n");
+       if (rtc->irq < 0)
                return rtc->irq;
-       }
 
        rtc->rtc = devm_rtc_allocate_device(&pdev->dev);
        if (IS_ERR(rtc->rtc))
@@ -656,7 +654,6 @@ static int sprd_rtc_probe(struct platform_device *pdev)
        rtc->rtc->range_max = 5662310399LL;
        ret = rtc_register_device(rtc->rtc);
        if (ret) {
-               dev_err(&pdev->dev, "failed to register rtc device\n");
                device_init_wakeup(&pdev->dev, 0);
                return ret;
        }