Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

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

diff --git a/drivers/rtc/rtc-max8997.c b/drivers/rtc/rtc-max8997.c
index f15202c771da59cf23c1da983cba64e7e426dcb8..dacf48db792593305961fbf10cb830de183d1926 100644 (file)
--- a/drivers/rtc/rtc-max8997.c
+++ b/drivers/rtc/rtc-max8997.c
@@ -479,8 +479,8 @@ static int max8997_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       info->rtc_dev = rtc_device_register("max8997-rtc", &pdev->dev,
-                       &max8997_rtc_ops, THIS_MODULE);
+       info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max8997-rtc",
+                                       &max8997_rtc_ops, THIS_MODULE);
 
        if (IS_ERR(info->rtc_dev)) {
                ret = PTR_ERR(info->rtc_dev);
@@ -491,6 +491,7 @@ static int max8997_rtc_probe(struct platform_device *pdev)
        virq = irq_create_mapping(max8997->irq_domain, MAX8997_PMICIRQ_RTCA1);
        if (!virq) {
                dev_err(&pdev->dev, "Failed to create mapping alarm IRQ\n");
+               ret = -ENXIO;
                goto err_out;
        }
        info->virq = virq;
@@ -498,26 +499,16 @@ static int max8997_rtc_probe(struct platform_device *pdev)
        ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
                                max8997_rtc_alarm_irq, 0,
                                "rtc-alarm0", info);
-       if (ret < 0) {
+       if (ret < 0)
                dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
                        info->virq, ret);
-               goto err_out;
-       }
-
-       return ret;
 
 err_out:
-       rtc_device_unregister(info->rtc_dev);
        return ret;
 }
 
 static int max8997_rtc_remove(struct platform_device *pdev)
 {
-       struct max8997_rtc_info *info = platform_get_drvdata(pdev);
-
-       if (info)
-               rtc_device_unregister(info->rtc_dev);
-
        return 0;
 }