Merge tag 'multiplatform-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/rtc/rtc-max8907.c b/drivers/rtc/rtc-max8907.c
index 9d62cdb83d113a399930fe7c3470114697aebb47..86afb797125dc4de28c643afaab1785375d47ca6 100644 (file)
--- a/drivers/rtc/rtc-max8907.c
+++ b/drivers/rtc/rtc-max8907.c
@@ -200,23 +200,16 @@ static int max8907_rtc_probe(struct platform_device *pdev)
 
        rtc->irq = regmap_irq_get_virq(max8907->irqc_rtc,
                                       MAX8907_IRQ_RTC_ALARM0);
-       if (rtc->irq < 0) {
-               ret = rtc->irq;
-               goto err_unregister;
-       }
+       if (rtc->irq < 0)
+               return rtc->irq;
 
        ret = devm_request_threaded_irq(&pdev->dev, rtc->irq, NULL,
                                max8907_irq_handler,
                                IRQF_ONESHOT, "max8907-alarm0", rtc);
-       if (ret < 0) {
+       if (ret < 0)
                dev_err(&pdev->dev, "Failed to request IRQ%d: %d\n",
                        rtc->irq, ret);
-               goto err_unregister;
-       }
-
-       return 0;
 
-err_unregister:
        return ret;
 }