Merge tag 'for-f2fs-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

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

diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index fd31571941f5102260c96fac9e6f28df890eacb6..ab56893aac73aa58ec0d475d26c6da7f01d4c514 100644 (file)
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -206,8 +206,7 @@ static irqreturn_t ds1553_rtc_interrupt(int irq, void *dev_id)
                        events |= RTC_UF;
                else
                        events |= RTC_AF;
-               if (likely(pdata->rtc))
-                       rtc_update_irq(pdata->rtc, 1, events);
+               rtc_update_irq(pdata->rtc, 1, events);
        }
        spin_unlock(&pdata->lock);
        return events ? IRQ_HANDLED : IRQ_NONE;
@@ -278,7 +277,6 @@ static struct bin_attribute ds1553_nvram_attr = {
 
 static int ds1553_rtc_probe(struct platform_device *pdev)
 {
-       struct rtc_device *rtc;
        struct resource *res;
        unsigned int cen, sec;
        struct rtc_plat_data *pdata;
@@ -311,6 +309,12 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
        spin_lock_init(&pdata->lock);
        pdata->last_jiffies = jiffies;
        platform_set_drvdata(pdev, pdata);
+
+       pdata->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
+                                 &ds1553_rtc_ops, THIS_MODULE);
+       if (IS_ERR(pdata->rtc))
+               return PTR_ERR(pdata->rtc);
+
        if (pdata->irq > 0) {
                writeb(0, ioaddr + RTC_INTERRUPTS);
                if (devm_request_irq(&pdev->dev, pdata->irq,
@@ -321,15 +325,12 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
                }
        }
 
-       rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
-                                 &ds1553_rtc_ops, THIS_MODULE);
-       if (IS_ERR(rtc))
-               return PTR_ERR(rtc);
-       pdata->rtc = rtc;
-
        ret = sysfs_create_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);
+       if (ret)
+               dev_err(&pdev->dev, "unable to create sysfs file: %s\n",
+                       ds1553_nvram_attr.attr.name);
 
-       return ret;
+       return 0;
 }
 
 static int ds1553_rtc_remove(struct platform_device *pdev)