Merge tag 'perf-tools-2020-12-24' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / rtc / rtc-omap.c

diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c
index d4ed20f..dc7db24 100644 (file)
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@ -9,7 +9,6 @@
  * Copyright (C) 2014 Johan Hovold <johan@kernel.org>
  */
 
-#include <dt-bindings/gpio/gpio.h>
 #include <linux/bcd.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -880,18 +879,18 @@ static int omap_rtc_probe(struct platform_device *pdev)
        /* Support ext_wakeup pinconf */
        rtc_pinctrl_desc.name = dev_name(&pdev->dev);
 
-       rtc->pctldev = pinctrl_register(&rtc_pinctrl_desc, &pdev->dev, rtc);
+       rtc->pctldev = devm_pinctrl_register(&pdev->dev, &rtc_pinctrl_desc, rtc);
        if (IS_ERR(rtc->pctldev)) {
                dev_err(&pdev->dev, "Couldn't register pinctrl driver\n");
                ret = PTR_ERR(rtc->pctldev);
                goto err;
        }
 
-       ret = rtc_register_device(rtc->rtc);
+       ret = devm_rtc_register_device(rtc->rtc);
        if (ret)
-               goto err_deregister_pinctrl;
+               goto err;
 
-       rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config);
+       devm_rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config);
 
        if (rtc->is_pmic_controller) {
                if (!pm_power_off) {
@@ -902,8 +901,6 @@ static int omap_rtc_probe(struct platform_device *pdev)
 
        return 0;
 
-err_deregister_pinctrl:
-       pinctrl_unregister(rtc->pctldev);
 err:
        clk_disable_unprepare(rtc->clk);
        device_init_wakeup(&pdev->dev, false);
@@ -946,9 +943,6 @@ static int omap_rtc_remove(struct platform_device *pdev)
        pm_runtime_put_sync(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
 
-       /* Remove ext_wakeup pinconf */
-       pinctrl_unregister(rtc->pctldev);
-
        return 0;
 }