rtc: nxp-bbnsm: Use resource managed API to simplify code

Use devm_pm_set_wake_irq and devm_device_init_wakeup to cleanup the
error handling code and 'driver.remove()' hook.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20250205-rtc-cleanup-v1-2-66165678e089@nxp.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-nxp-bbnsm.c b/drivers/rtc/rtc-nxp-bbnsm.c
index fa3b0328c7a255ff8a902a58d61a4b0e59eac493..d4fc9dc583d317d4852b7d897a6c45cfff6961a2 100644 (file)
--- a/drivers/rtc/rtc-nxp-bbnsm.c
+++ b/drivers/rtc/rtc-nxp-bbnsm.c
@@ -189,36 +189,26 @@ static int bbnsm_rtc_probe(struct platform_device *pdev)
        /* clear all the pending events */
        regmap_write(bbnsm->regmap, BBNSM_EVENTS, 0x7A);
 
-       device_init_wakeup(&pdev->dev, true);
-       dev_pm_set_wake_irq(&pdev->dev, bbnsm->irq);
+       ret = devm_device_init_wakeup(&pdev->dev);
+       if (ret)
+               dev_err(&pdev->dev, "failed to init wakeup, %d\n", ret);
+
+       ret = devm_pm_set_wake_irq(&pdev->dev, bbnsm->irq);
+       if (ret)
+               dev_err(&pdev->dev, "failed to set wake irq, %d\n", ret);
 
        ret = devm_request_irq(&pdev->dev, bbnsm->irq, bbnsm_rtc_irq_handler,
                               IRQF_SHARED, "rtc alarm", &pdev->dev);
        if (ret) {
                dev_err(&pdev->dev, "failed to request irq %d: %d\n",
                        bbnsm->irq, ret);
-               goto err;
+               return ret;
        }
 
        bbnsm->rtc->ops = &bbnsm_rtc_ops;
        bbnsm->rtc->range_max = U32_MAX;
 
-       ret = devm_rtc_register_device(bbnsm->rtc);
-       if (ret)
-               goto err;
-
-       return 0;
-
-err:
-       dev_pm_clear_wake_irq(&pdev->dev);
-       device_init_wakeup(&pdev->dev, false);
-       return ret;
-}
-
-static void bbnsm_rtc_remove(struct platform_device *pdev)
-{
-       dev_pm_clear_wake_irq(&pdev->dev);
-       device_init_wakeup(&pdev->dev, false);
+       return devm_rtc_register_device(bbnsm->rtc);
 }
 
 static const struct of_device_id bbnsm_dt_ids[] = {
@@ -233,7 +223,6 @@ static struct platform_driver bbnsm_rtc_driver = {
                .of_match_table = bbnsm_dt_ids,
        },
        .probe = bbnsm_rtc_probe,
-       .remove = bbnsm_rtc_remove,
 };
 module_platform_driver(bbnsm_rtc_driver);