rtc: rtc-sh: switch to using SIMPLE_DEV_PM_OPS

[~andy/linux] / drivers / rtc / rtc-max77686.c

diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c
index 9de93e72a18acbb41e4e65aa38dd440ea1f16d23..5a12b32f77ecc5bbff3771d1da3139f08d182a05 100644 (file)
--- a/drivers/rtc/rtc-max77686.c
+++ b/drivers/rtc/rtc-max77686.c
@@ -466,7 +466,7 @@ static void max77686_rtc_enable_smpl(struct max77686_rtc_info *info, bool enable
 
        val = 0;
        regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val);
-       pr_info("%s: WTSR_SMPL(0x%02x)\n", __func__, val);
+       dev_info(info->dev, "%s: WTSR_SMPL(0x%02x)\n", __func__, val);
 }
 #endif /* MAX77686_RTC_WTSR_SMPL */
 
@@ -538,8 +538,8 @@ static int max77686_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       info->rtc_dev = rtc_device_register("max77686-rtc", &pdev->dev,
-                       &max77686_rtc_ops, THIS_MODULE);
+       info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max77686-rtc",
+                                       &max77686_rtc_ops, THIS_MODULE);
 
        if (IS_ERR(info->rtc_dev)) {
                dev_info(&pdev->dev, "%s: fail\n", __func__);
@@ -555,8 +555,8 @@ static int max77686_rtc_probe(struct platform_device *pdev)
                goto err_rtc;
        info->virq = virq;
 
-       ret = request_threaded_irq(virq, NULL, max77686_rtc_alarm_irq, 0,
-                       "rtc-alarm0", info);
+       ret = devm_request_threaded_irq(&pdev->dev, virq, NULL,
+                               max77686_rtc_alarm_irq, 0, "rtc-alarm0", info);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to request alarm IRQ: %d: %d\n",
                        info->virq, ret);
@@ -569,13 +569,6 @@ err_rtc:
 
 static int max77686_rtc_remove(struct platform_device *pdev)
 {
-       struct max77686_rtc_info *info = platform_get_drvdata(pdev);
-
-       if (info) {
-               free_irq(info->virq, info);
-               rtc_device_unregister(info->rtc_dev);
-       }
-
        return 0;
 }
 
@@ -589,11 +582,14 @@ static void max77686_rtc_shutdown(struct platform_device *pdev)
        for (i = 0; i < 3; i++) {
                max77686_rtc_enable_wtsr(info, false);
                regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val);
-               pr_info("%s: WTSR_SMPL reg(0x%02x)\n", __func__, val);
-               if (val & WTSR_EN_MASK)
-                       pr_emerg("%s: fail to disable WTSR\n", __func__);
-               else {
-                       pr_info("%s: success to disable WTSR\n", __func__);
+               dev_info(info->dev, "%s: WTSR_SMPL reg(0x%02x)\n", __func__,
+                               val);
+               if (val & WTSR_EN_MASK) {
+                       dev_emerg(info->dev, "%s: fail to disable WTSR\n",
+                                       __func__);
+               } else {
+                       dev_info(info->dev, "%s: success to disable WTSR\n",
+                                       __func__);
                        break;
                }
        }