Skip to contentSkip to conversation

rtc: rework resource management

PATCH Applied Bartosz Golaszewski 4 participants 15 messages Nov 9, 2020 – Nov 27, 2020 1 message not in the archive

Subsystems (36)
lore
Share & tools
lore
#0 lore raw

cover rtc: rework resource management

From: Bartosz Golaszewski <[email protected]>

Hi Alexandre,

As discussed: this is my take on RTC devres. The series does a couple things:
it adds missing documentation of managed RTC functions, adds the 'devm_' prefix to managed APIs, makes the rtc_device struct unaware of being managed (removes the registered field) and also shrinks devm_rtc_allocate_device().

Other than that, there are some semi-related patches in here, like the one using the managed variant of pinctrl_register() in rtc-omap and another one adding a generic error message when nvmem registraton fails.

I incorporated your RTC nvmem patch into the series with a minor tweak to it.

Alexandre Belloni (1):
rtc: nvmem: remove nvram ABI

Bartosz Golaszewski (7):
rtc: omap: use devm_pinctrl_register()
Revert "rtc: sc27xx: Always read normal alarm when registering RTC
device"
Documentation: list RTC devres helpers in devres.rst
rtc: add devm_ prefix to rtc_nvmem_register()
rtc: nvmem: emit an error message when nvmem registration fails
rtc: rework rtc_register_device() resource management
rtc: shrink devm_rtc_allocate_device()

 .../driver-api/driver-model/devres.rst        |  6 ++
 arch/alpha/kernel/rtc.c                       |  2 +-
 drivers/mfd/menelaus.c                        |  2 +-
 drivers/rtc/class.c                           | 50 ++++------
 drivers/rtc/nvmem.c                           | 91 ++-----------------
 drivers/rtc/rtc-88pm80x.c                     |  2 +-
 drivers/rtc/rtc-88pm860x.c                    |  2 +-
 drivers/rtc/rtc-ab-b5ze-s3.c                  |  2 +-
 drivers/rtc/rtc-ab-eoz9.c                     |  2 +-
 drivers/rtc/rtc-ab3100.c                      |  2 +-
 drivers/rtc/rtc-ab8500.c                      |  2 +-
 drivers/rtc/rtc-abx80x.c                      |  2 +-
 drivers/rtc/rtc-ac100.c                       |  2 +-
 drivers/rtc/rtc-armada38x.c                   |  2 +-
 drivers/rtc/rtc-aspeed.c                      |  2 +-
 drivers/rtc/rtc-at91rm9200.c                  |  2 +-
 drivers/rtc/rtc-at91sam9.c                    |  2 +-
 drivers/rtc/rtc-au1xxx.c                      |  2 +-
 drivers/rtc/rtc-bd70528.c                     |  2 +-
 drivers/rtc/rtc-brcmstb-waketimer.c           |  2 +-
 drivers/rtc/rtc-cadence.c                     |  2 +-
 drivers/rtc/rtc-cmos.c                        |  6 +-
 drivers/rtc/rtc-coh901331.c                   |  2 +-
 drivers/rtc/rtc-cpcap.c                       |  2 +-
 drivers/rtc/rtc-cros-ec.c                     |  2 +-
 drivers/rtc/rtc-da9052.c                      |  2 +-
 drivers/rtc/rtc-da9063.c                      |  2 +-
 drivers/rtc/rtc-davinci.c                     |  2 +-
 drivers/rtc/rtc-digicolor.c                   |  2 +-
 drivers/rtc/rtc-dm355evm.c                    |  2 +-
 drivers/rtc/rtc-ds1305.c                      |  5 +-
 drivers/rtc/rtc-ds1307.c                      |  5 +-
 drivers/rtc/rtc-ds1343.c                      |  5 +-
 drivers/rtc/rtc-ds1347.c                      |  2 +-
 drivers/rtc/rtc-ds1374.c                      |  2 +-
 drivers/rtc/rtc-ds1511.c                      |  6 +-
 drivers/rtc/rtc-ds1553.c                      |  6 +-
 drivers/rtc/rtc-ds1672.c                      |  2 +-
 drivers/rtc/rtc-ds1685.c                      |  5 +-
 drivers/rtc/rtc-ds1742.c                      |  6 +-
 drivers/rtc/rtc-ds2404.c                      |  2 +-
 drivers/rtc/rtc-ds3232.c                      |  2 +-
 drivers/rtc/rtc-ep93xx.c                      |  2 +-
 drivers/rtc/rtc-fsl-ftm-alarm.c               |  2 +-
 drivers/rtc/rtc-ftrtc010.c                    |  2 +-
 drivers/rtc/rtc-goldfish.c                    |  2 +-
 drivers/rtc/rtc-imx-sc.c                      |  2 +-
 drivers/rtc/rtc-imxdi.c                       |  2 +-
 drivers/rtc/rtc-isl12026.c                    |  4 +-
 drivers/rtc/rtc-isl1208.c                     |  4 +-
 drivers/rtc/rtc-jz4740.c                      |  2 +-
 drivers/rtc/rtc-lpc32xx.c                     |  2 +-
 drivers/rtc/rtc-ls1x.c                        |  2 +-
 drivers/rtc/rtc-m41t80.c                      |  2 +-
 drivers/rtc/rtc-m48t59.c                      |  5 +-
 drivers/rtc/rtc-m48t86.c                      |  5 +-
 drivers/rtc/rtc-mc13xxx.c                     |  2 +-
 drivers/rtc/rtc-meson-vrtc.c                  |  2 +-
 drivers/rtc/rtc-meson.c                       |  4 +-
 drivers/rtc/rtc-mpc5121.c                     |  2 +-
 drivers/rtc/rtc-mrst.c                        |  2 +-
 drivers/rtc/rtc-mt2712.c                      |  2 +-
 drivers/rtc/rtc-mt6397.c                      |  2 +-
 drivers/rtc/rtc-mv.c                          |  2 +-
 drivers/rtc/rtc-mxc.c                         |  2 +-
 drivers/rtc/rtc-mxc_v2.c                      |  2 +-
 drivers/rtc/rtc-omap.c                        | 13 +--
 drivers/rtc/rtc-pcap.c                        |  2 +-
 drivers/rtc/rtc-pcf2123.c                     |  2 +-
 drivers/rtc/rtc-pcf2127.c                     |  4 +-
 drivers/rtc/rtc-pcf85063.c                    |  4 +-
 drivers/rtc/rtc-pcf85363.c                    |  4 +-
 drivers/rtc/rtc-pcf8563.c                     |  2 +-
 drivers/rtc/rtc-pic32.c                       |  2 +-
 drivers/rtc/rtc-pl030.c                       |  2 +-
 drivers/rtc/rtc-pl031.c                       |  2 +-
 drivers/rtc/rtc-pm8xxx.c                      |  2 +-
 drivers/rtc/rtc-ps3.c                         |  2 +-
 drivers/rtc/rtc-r9701.c                       |  2 +-
 drivers/rtc/rtc-rc5t619.c                     |  2 +-
 drivers/rtc/rtc-rk808.c                       |  2 +-
 drivers/rtc/rtc-rp5c01.c                      |  5 +-
 drivers/rtc/rtc-rs5c348.c                     |  2 +-
 drivers/rtc/rtc-rv3028.c                      |  6 +-
 drivers/rtc/rtc-rv3029c2.c                    |  4 +-
 drivers/rtc/rtc-rv3032.c                      |  6 +-
 drivers/rtc/rtc-rv8803.c                      |  5 +-
 drivers/rtc/rtc-rx8010.c                      |  2 +-
 drivers/rtc/rtc-rx8581.c                      |  4 +-
 drivers/rtc/rtc-s35390a.c                     |  2 +-
 drivers/rtc/rtc-sa1100.c                      |  2 +-
 drivers/rtc/rtc-sc27xx.c                      | 10 +-
 drivers/rtc/rtc-sd3078.c                      |  2 +-
 drivers/rtc/rtc-sh.c                          |  2 +-
 drivers/rtc/rtc-sirfsoc.c                     |  2 +-
 drivers/rtc/rtc-snvs.c                        |  2 +-
 drivers/rtc/rtc-st-lpc.c                      |  2 +-
 drivers/rtc/rtc-starfire.c                    |  2 +-
 drivers/rtc/rtc-stk17ta8.c                    |  5 +-
 drivers/rtc/rtc-stmp3xxx.c                    |  2 +-
 drivers/rtc/rtc-sun4v.c                       |  2 +-
 drivers/rtc/rtc-sun6i.c                       |  2 +-
 drivers/rtc/rtc-sunxi.c                       |  2 +-
 drivers/rtc/rtc-tegra.c                       |  2 +-
 drivers/rtc/rtc-test.c                        |  2 +-
 drivers/rtc/rtc-tps6586x.c                    |  2 +-
 drivers/rtc/rtc-tps65910.c                    |  2 +-
 drivers/rtc/rtc-tx4939.c                      |  5 +-
 drivers/rtc/rtc-vr41xx.c                      |  2 +-
 drivers/rtc/rtc-vt8500.c                      |  2 +-
 drivers/rtc/rtc-wilco-ec.c                    |  2 +-
 drivers/rtc/rtc-wm831x.c                      |  2 +-
 drivers/rtc/rtc-xgene.c                       |  2 +-
 drivers/rtc/rtc-zynqmp.c                      |  2 +-
 drivers/rtc/sysfs.c                           |  2 -
 include/linux/rtc.h                           | 22 ++---
 116 files changed, 180 insertions(+), 302 deletions(-)
Signature · 1 line
2.29.1
#1 lore raw

PATCH 1/8 rtc: omap: use devm_pinctrl_register()

From: Bartosz Golaszewski <[email protected]>

Use a managed variant of pinctrl_register(). This way we can shorten the remove() callback as well as drop a goto label from probe().

---
 drivers/rtc/rtc-omap.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
drivers/rtc/rtc-omap.c +2 -7
index c20fc7937dfa..606fa80ad6e0 100644
@@ -879,7 +879,7 @@ 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);
@@ -888,7 +888,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
 
 	ret = rtc_register_device(rtc->rtc);
 	if (ret)
-		goto err_deregister_pinctrl;
+		goto err;
 
 	rtc_nvmem_register(rtc->rtc, &omap_rtc_nvmem_config);
 
@@ -901,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);
@@ -945,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;
 }
 
Signature · 1 line
2.29.1
#2 lore raw

PATCH 2/8 Revert "rtc: sc27xx: Always read normal alarm when registering RTC device"

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

This reverts commit 3822d1bb0df18aa28930f19bc46e0704aea1be0f.

The registered field in struct rtc_device is not supposed to be used by drivers and is going to be removed soon. In this function it will be always 0 so the check is useless anyway.

---
 drivers/rtc/rtc-sc27xx.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/rtc/rtc-sc27xx.c +2 -6
index 36810dd40cd3..8e3d6be990c5 100644
@@ -415,14 +415,10 @@ static int sprd_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 	u32 val;
 
 	/*
-	 * Before RTC device is registered, it will check to see if there is an
-	 * alarm already set in RTC hardware, and we always read the normal
-	 * alarm at this time.
-	 *
-	 * Or if aie_timer is enabled, we should get the normal alarm time.
+	 * If aie_timer is enabled, we should get the normal alarm time.
 	 * Otherwise we should get auxiliary alarm time.
 	 */
-	if (rtc->rtc && rtc->rtc->registered && rtc->rtc->aie_timer.enabled == 0)
+	if (rtc->rtc && rtc->rtc->aie_timer.enabled == 0)
 		return sprd_rtc_read_aux_alarm(dev, alrm);
 
 	ret = sprd_rtc_get_secs(rtc, SPRD_RTC_ALARM, &secs);
Signature · 1 line
2.29.1
#4 lore raw

PATCH 3/8 Documentation: list RTC devres helpers in devres.rst

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

It's customary to list all devres helpers in devres.rst. Add missing RTC routines.

---
 Documentation/driver-api/driver-model/devres.rst | 4 ++++
 1 file changed, 4 insertions(+)
Documentation/driver-api/driver-model/devres.rst +4 -0
index bb676570acc3..6ffc0f07404f 100644
@@ -411,6 +411,10 @@ RESET
   devm_reset_control_get()
   devm_reset_controller_register()
 
+RTC
+  devm_rtc_device_register()
+  devm_rtc_allocate_device()
+
 SERDEV
   devm_serdev_device_open()
 
Signature · 1 line
2.29.1
#6 lore raw

PATCH 5/8 rtc: add devm_ prefix to rtc_nvmem_register()

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

rtc_nvmem_register() is a managed interface. It doesn't require any release function to be called at driver detach. To avoid confusing driver authors, let's rename it to devm_rtc_nvmem_register() and add it to the list of managed interfaces in Documentation/.

---
 Documentation/driver-api/driver-model/devres.rst | 1 +
 drivers/rtc/nvmem.c                              | 4 ++--
 drivers/rtc/rtc-cmos.c                           | 2 +-
 drivers/rtc/rtc-ds1305.c                         | 2 +-
 drivers/rtc/rtc-ds1307.c                         | 2 +-
 drivers/rtc/rtc-ds1343.c                         | 2 +-
 drivers/rtc/rtc-ds1511.c                         | 2 +-
 drivers/rtc/rtc-ds1553.c                         | 2 +-
 drivers/rtc/rtc-ds1685.c                         | 2 +-
 drivers/rtc/rtc-ds1742.c                         | 2 +-
 drivers/rtc/rtc-ds3232.c                         | 2 +-
 drivers/rtc/rtc-isl12026.c                       | 2 +-
 drivers/rtc/rtc-isl1208.c                        | 2 +-
 drivers/rtc/rtc-m48t59.c                         | 2 +-
 drivers/rtc/rtc-m48t86.c                         | 2 +-
 drivers/rtc/rtc-meson.c                          | 2 +-
 drivers/rtc/rtc-omap.c                           | 2 +-
 drivers/rtc/rtc-pcf2127.c                        | 2 +-
 drivers/rtc/rtc-pcf85063.c                       | 2 +-
 drivers/rtc/rtc-pcf85363.c                       | 2 +-
 drivers/rtc/rtc-rp5c01.c                         | 2 +-
 drivers/rtc/rtc-rv3028.c                         | 4 ++--
 drivers/rtc/rtc-rv3029c2.c                       | 2 +-
 drivers/rtc/rtc-rv3032.c                         | 4 ++--
 drivers/rtc/rtc-rv8803.c                         | 2 +-
 drivers/rtc/rtc-rx8581.c                         | 2 +-
 drivers/rtc/rtc-stk17ta8.c                       | 2 +-
 drivers/rtc/rtc-tx4939.c                         | 2 +-
 include/linux/rtc.h                              | 8 ++++----
 29 files changed, 35 insertions(+), 34 deletions(-)
Documentation/driver-api/driver-model/devres.rst +1 -0
index 6ffc0f07404f..5df7ba54a4ba 100644
@@ -414,6 +414,7 @@ RESET
 RTC
   devm_rtc_device_register()
   devm_rtc_allocate_device()
+  devm_rtc_nvmem_register()
 
 SERDEV
   devm_serdev_device_open()
drivers/rtc/nvmem.c +2 -2
index 5e0b178a3b65..7502deb6390e 100644
@@ -10,7 +10,7 @@
 #include <linux/nvmem-consumer.h>
 #include <linux/rtc.h>
 
-int rtc_nvmem_register(struct rtc_device *rtc,
+int devm_rtc_nvmem_register(struct rtc_device *rtc,
 		       struct nvmem_config *nvmem_config)
 {
 	struct nvmem_device *nvmem;
@@ -24,4 +24,4 @@ int rtc_nvmem_register(struct rtc_device *rtc,
 
 	return PTR_ERR_OR_ZERO(nvmem);
 }
-EXPORT_SYMBOL_GPL(rtc_nvmem_register);
+EXPORT_SYMBOL_GPL(devm_rtc_nvmem_register);
drivers/rtc/rtc-cmos.c +1 -1
index adca0de76e53..eea91c1538aa 100644
@@ -869,7 +869,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 
 	/* export at least the first block of NVRAM */
 	nvmem_cfg.size = address_space - NVRAM_OFFSET;
-	if (rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg))
+	if (devm_rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg))
 		dev_err(dev, "nvmem registration failed\n");
 
 	dev_info(dev, "%s%s, %d bytes nvram%s\n",
drivers/rtc/rtc-ds1305.c +1 -1
index a1ed539d41b4..a4e768261b43 100644
@@ -698,7 +698,7 @@ static int ds1305_probe(struct spi_device *spi)
 	if (status)
 		return status;
 
-	rtc_nvmem_register(ds1305->rtc, &ds1305_nvmem_cfg);
+	devm_rtc_nvmem_register(ds1305->rtc, &ds1305_nvmem_cfg);
 
 	/* Maybe set up alarm IRQ; be ready to handle it triggering right
 	 * away.  NOTE that we don't share this.  The signal is active low,
drivers/rtc/rtc-ds1307.c +1 -1
index 2e6063807bd4..1dc377e0b225 100644
@@ -2047,7 +2047,7 @@ static int ds1307_probe(struct i2c_client *client,
 			.priv = ds1307,
 		};
 
-		rtc_nvmem_register(ds1307->rtc, &nvmem_cfg);
+		devm_rtc_nvmem_register(ds1307->rtc, &nvmem_cfg);
 	}
 
 	ds1307_hwmon_register(ds1307);
drivers/rtc/rtc-ds1343.c +1 -1
index e7604e844cbd..ea663e24a34c 100644
@@ -413,7 +413,7 @@ static int ds1343_probe(struct spi_device *spi)
 		return res;
 
 	nvmem_cfg.priv = priv;
-	rtc_nvmem_register(priv->rtc, &nvmem_cfg);
+	devm_rtc_nvmem_register(priv->rtc, &nvmem_cfg);
 
 	priv->irq = spi->irq;
 
drivers/rtc/rtc-ds1511.c +1 -1
index 33c483d759c8..d5f48216e851 100644
@@ -470,7 +470,7 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	rtc_nvmem_register(pdata->rtc, &ds1511_nvmem_cfg);
+	devm_rtc_nvmem_register(pdata->rtc, &ds1511_nvmem_cfg);
 
 	/*
 	 * if the platform has an interrupt in mind for this device,
drivers/rtc/rtc-ds1553.c +1 -1
index c6a5563504e5..2d2eb739d92b 100644
@@ -309,7 +309,7 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
 		}
 	}
 
-	if (rtc_nvmem_register(pdata->rtc, &nvmem_cfg))
+	if (devm_rtc_nvmem_register(pdata->rtc, &nvmem_cfg))
 		dev_err(&pdev->dev, "unable to register nvmem\n");
 
 	return 0;
drivers/rtc/rtc-ds1685.c +1 -1
index 9043c96e8845..bef588fce266 100644
@@ -1317,7 +1317,7 @@ ds1685_rtc_probe(struct platform_device *pdev)
 		return ret;
 
 	nvmem_cfg.priv = rtc;
-	ret = rtc_nvmem_register(rtc_dev, &nvmem_cfg);
+	ret = devm_rtc_nvmem_register(rtc_dev, &nvmem_cfg);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1742.c +1 -1
index 291bbed90ef8..29792a8cce97 100644
@@ -195,7 +195,7 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	if (rtc_nvmem_register(rtc, &nvmem_cfg))
+	if (devm_rtc_nvmem_register(rtc, &nvmem_cfg))
 		dev_err(&pdev->dev, "Unable to register nvmem\n");
 
 	return 0;
drivers/rtc/rtc-ds3232.c +1 -1
index 69c37ab64352..16b89035d135 100644
@@ -518,7 +518,7 @@ static int ds3232_probe(struct device *dev, struct regmap *regmap, int irq,
 	if (IS_ERR(ds3232->rtc))
 		return PTR_ERR(ds3232->rtc);
 
-	ret = rtc_nvmem_register(ds3232->rtc, &nvmem_cfg);
+	ret = devm_rtc_nvmem_register(ds3232->rtc, &nvmem_cfg);
 	if(ret)
 		return ret;
 
drivers/rtc/rtc-isl12026.c +1 -1
index 5b6b17fb6d62..fff8d8253669 100644
@@ -465,7 +465,7 @@ static int isl12026_probe_new(struct i2c_client *client)
 
 	priv->rtc->ops = &isl12026_rtc_ops;
 	nvm_cfg.priv = priv;
-	ret = rtc_nvmem_register(priv->rtc, &nvm_cfg);
+	ret = devm_rtc_nvmem_register(priv->rtc, &nvm_cfg);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-isl1208.c +1 -1
index ebb691fa48a6..08d778b10e9e 100644
@@ -890,7 +890,7 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	if (rc)
 		return rc;
 
-	rc = rtc_nvmem_register(isl1208->rtc, &isl1208->nvmem_config);
+	rc = devm_rtc_nvmem_register(isl1208->rtc, &isl1208->nvmem_config);
 	if (rc)
 		return rc;
 
drivers/rtc/rtc-m48t59.c +1 -1
index ee1d8f0146fd..e966a66ab2d3 100644
@@ -466,7 +466,7 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
 	m48t59->rtc->ops = ops;
 
 	nvmem_cfg.size = pdata->offset;
-	ret = rtc_nvmem_register(m48t59->rtc, &nvmem_cfg);
+	ret = devm_rtc_nvmem_register(m48t59->rtc, &nvmem_cfg);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-m48t86.c +1 -1
index 2b1135590dd5..182cfe59e4e0 100644
@@ -259,7 +259,7 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	rtc_nvmem_register(info->rtc, &m48t86_nvmem_cfg);
+	devm_rtc_nvmem_register(info->rtc, &m48t86_nvmem_cfg);
 
 	/* read battery status */
 	reg = m48t86_readb(&pdev->dev, M48T86_D);
drivers/rtc/rtc-meson.c +1 -1
index 47ebcf834cc2..938267713a4d 100644
@@ -365,7 +365,7 @@ static int meson_rtc_probe(struct platform_device *pdev)
 	}
 
 	meson_rtc_nvmem_config.priv = rtc;
-	ret = rtc_nvmem_register(rtc->rtc, &meson_rtc_nvmem_config);
+	ret = devm_rtc_nvmem_register(rtc->rtc, &meson_rtc_nvmem_config);
 	if (ret)
 		goto out_disable_vdd;
 
drivers/rtc/rtc-omap.c +1 -1
index 606fa80ad6e0..e65f79fc7718 100644
@@ -890,7 +890,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		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) {
drivers/rtc/rtc-pcf2127.c +1 -1
index 07a5630ec841..b803bbbca7b8 100644
@@ -594,7 +594,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
 			.size = 512,
 		};
 
-		ret = rtc_nvmem_register(pcf2127->rtc, &nvmem_cfg);
+		ret = devm_rtc_nvmem_register(pcf2127->rtc, &nvmem_cfg);
 	}
 
 	/*
drivers/rtc/rtc-pcf85063.c +1 -1
index f8b99cb72959..c19f139e9b8d 100644
@@ -607,7 +607,7 @@ static int pcf85063_probe(struct i2c_client *client)
 	}
 
 	nvmem_cfg.priv = pcf85063->regmap;
-	rtc_nvmem_register(pcf85063->rtc, &nvmem_cfg);
+	devm_rtc_nvmem_register(pcf85063->rtc, &nvmem_cfg);
 
 #ifdef CONFIG_COMMON_CLK
 	/* register clk in common clk framework */
drivers/rtc/rtc-pcf85363.c +1 -1
index 3450d615974d..23cf14ca2c96 100644
@@ -422,7 +422,7 @@ static int pcf85363_probe(struct i2c_client *client,
 
 	for (i = 0; i < config->num_nvram; i++) {
 		nvmem_cfg[i].priv = pcf85363;
-		rtc_nvmem_register(pcf85363->rtc, &nvmem_cfg[i]);
+		devm_rtc_nvmem_register(pcf85363->rtc, &nvmem_cfg[i]);
 	}
 
 	return ret;
drivers/rtc/rtc-rp5c01.c +1 -1
index a69e8adcc4a1..8bc476c0905f 100644
@@ -255,7 +255,7 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 	priv->rtc = rtc;
 
 	nvmem_cfg.priv = priv;
-	error = rtc_nvmem_register(rtc, &nvmem_cfg);
+	error = devm_rtc_nvmem_register(rtc, &nvmem_cfg);
 	if (error)
 		return error;
 
drivers/rtc/rtc-rv3028.c +2 -2
index fa226f0fe67d..f788df979750 100644
@@ -891,9 +891,9 @@ static int rv3028_probe(struct i2c_client *client)
 		return ret;
 
 	nvmem_cfg.priv = rv3028->regmap;
-	rtc_nvmem_register(rv3028->rtc, &nvmem_cfg);
+	devm_rtc_nvmem_register(rv3028->rtc, &nvmem_cfg);
 	eeprom_cfg.priv = rv3028;
-	rtc_nvmem_register(rv3028->rtc, &eeprom_cfg);
+	devm_rtc_nvmem_register(rv3028->rtc, &eeprom_cfg);
 
 	rv3028->rtc->max_user_freq = 1;
 
drivers/rtc/rtc-rv3029c2.c +1 -1
index 62718231731b..ad359b3b74b2 100644
@@ -755,7 +755,7 @@ static int rv3029_probe(struct device *dev, struct regmap *regmap, int irq,
 		return rc;
 
 	nvmem_cfg.priv = rv3029->regmap;
-	rtc_nvmem_register(rv3029->rtc, &nvmem_cfg);
+	devm_rtc_nvmem_register(rv3029->rtc, &nvmem_cfg);
 
 	return 0;
 }
drivers/rtc/rtc-rv3032.c +2 -2
index 3e67f71f4261..c95fa7cd0bfe 100644
@@ -890,9 +890,9 @@ static int rv3032_probe(struct i2c_client *client)
 		return ret;
 
 	nvmem_cfg.priv = rv3032;
-	rtc_nvmem_register(rv3032->rtc, &nvmem_cfg);
+	devm_rtc_nvmem_register(rv3032->rtc, &nvmem_cfg);
 	eeprom_cfg.priv = rv3032;
-	rtc_nvmem_register(rv3032->rtc, &eeprom_cfg);
+	devm_rtc_nvmem_register(rv3032->rtc, &eeprom_cfg);
 
 	rv3032->rtc->max_user_freq = 1;
 
drivers/rtc/rtc-rv8803.c +1 -1
index 1d888da48c7c..44e1818a751c 100644
@@ -591,7 +591,7 @@ static int rv8803_probe(struct i2c_client *client,
 	if (err)
 		return err;
 
-	rtc_nvmem_register(rv8803->rtc, &nvmem_cfg);
+	devm_rtc_nvmem_register(rv8803->rtc, &nvmem_cfg);
 
 	rv8803->rtc->max_user_freq = 1;
 
drivers/rtc/rtc-rx8581.c +1 -1
index 490f70f57636..017f74721cc0 100644
@@ -302,7 +302,7 @@ static int rx8581_probe(struct i2c_client *client,
 
 	for (i = 0; i < config->num_nvram; i++) {
 		nvmem_cfg[i].priv = rx8581;
-		rtc_nvmem_register(rx8581->rtc, &nvmem_cfg[i]);
+		devm_rtc_nvmem_register(rx8581->rtc, &nvmem_cfg[i]);
 	}
 
 	return ret;
drivers/rtc/rtc-stk17ta8.c +1 -1
index 1ccf0d5d05b4..ad616bce7bca 100644
@@ -313,7 +313,7 @@ static int stk17ta8_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->ops = &stk17ta8_rtc_ops;
 
 	nvmem_cfg.priv = pdata;
-	ret = rtc_nvmem_register(pdata->rtc, &nvmem_cfg);
+	ret = devm_rtc_nvmem_register(pdata->rtc, &nvmem_cfg);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-tx4939.c +1 -1
index abbb62b14d7a..11f46272bad3 100644
@@ -271,7 +271,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 	pdata->rtc = rtc;
 
 	nvmem_cfg.priv = pdata;
-	ret = rtc_nvmem_register(rtc, &nvmem_cfg);
+	ret = devm_rtc_nvmem_register(rtc, &nvmem_cfg);
 	if (ret)
 		return ret;
 
include/linux/rtc.h +4 -4
index 0983ab9faffb..cbca651d8ca4 100644
@@ -244,11 +244,11 @@ extern int rtc_hctosys_ret;
 #endif
 
 #ifdef CONFIG_RTC_NVMEM
-int rtc_nvmem_register(struct rtc_device *rtc,
-		       struct nvmem_config *nvmem_config);
+int devm_rtc_nvmem_register(struct rtc_device *rtc,
+			    struct nvmem_config *nvmem_config);
 #else
-static inline int rtc_nvmem_register(struct rtc_device *rtc,
-				     struct nvmem_config *nvmem_config)
+static inline int devm_rtc_nvmem_register(struct rtc_device *rtc,
+					  struct nvmem_config *nvmem_config)
 {
 	return 0;
 }
Signature · 1 line
2.29.1
#7 lore raw

PATCH 6/8 rtc: nvmem: emit an error message when nvmem registration fails

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

Some users check the return value of devm_rtc_nvmem_register() only in order to emit an error message and then continue probing. This is fine as an rtc can function without exposing nvmem but let's generalize it:
let's make the registration function emit the error message so that users don't have to.

---
 drivers/rtc/nvmem.c      | 7 +++++--
 drivers/rtc/rtc-cmos.c   | 3 +--
 drivers/rtc/rtc-ds1553.c | 3 +--
 drivers/rtc/rtc-ds1742.c | 3 +--
 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/rtc/nvmem.c +5 -2
index 7502deb6390e..07ede21cee34 100644
@@ -13,14 +13,17 @@
 int devm_rtc_nvmem_register(struct rtc_device *rtc,
 		       struct nvmem_config *nvmem_config)
 {
+	struct device *dev = rtc->dev.parent;
 	struct nvmem_device *nvmem;
 
 	if (!nvmem_config)
 		return -ENODEV;
 
-	nvmem_config->dev = rtc->dev.parent;
+	nvmem_config->dev = dev;
 	nvmem_config->owner = rtc->owner;
-	nvmem = devm_nvmem_register(rtc->dev.parent, nvmem_config);
+	nvmem = devm_nvmem_register(dev, nvmem_config);
+	if (IS_ERR(nvmem))
+		dev_err(dev, "failed to register nvmem device for RTC\n");
 
 	return PTR_ERR_OR_ZERO(nvmem);
 }
drivers/rtc/rtc-cmos.c +1 -2
index eea91c1538aa..766074c04b53 100644
@@ -869,8 +869,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 
 	/* export at least the first block of NVRAM */
 	nvmem_cfg.size = address_space - NVRAM_OFFSET;
-	if (devm_rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg))
-		dev_err(dev, "nvmem registration failed\n");
+	devm_rtc_nvmem_register(cmos_rtc.rtc, &nvmem_cfg);
 
 	dev_info(dev, "%s%s, %d bytes nvram%s\n",
 		 !is_valid_irq(rtc_irq) ? "no alarms" :
drivers/rtc/rtc-ds1553.c +1 -2
index 2d2eb739d92b..bb40ea8b6373 100644
@@ -309,8 +309,7 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
 		}
 	}
 
-	if (devm_rtc_nvmem_register(pdata->rtc, &nvmem_cfg))
-		dev_err(&pdev->dev, "unable to register nvmem\n");
+	devm_rtc_nvmem_register(pdata->rtc, &nvmem_cfg);
 
 	return 0;
 }
drivers/rtc/rtc-ds1742.c +1 -2
index 29792a8cce97..39c6c3a85b34 100644
@@ -195,8 +195,7 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	if (devm_rtc_nvmem_register(rtc, &nvmem_cfg))
-		dev_err(&pdev->dev, "Unable to register nvmem\n");
+	devm_rtc_nvmem_register(rtc, &nvmem_cfg);
 
 	return 0;
 }
Signature · 1 line
2.29.1
#14 lore raw

PATCH 8/8 rtc: shrink devm_rtc_allocate_device()

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

We don't need to use devres_alloc() & devres_add() manually if all we want to manage is a single pointer. We can shrink the code by using devm_add_action_or_reset() instead. The number of allocations stays the same.

---
 drivers/rtc/class.c | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)
drivers/rtc/class.c +9 -20
index b8a34ee039ad..a1b3711aaf01 100644
@@ -337,48 +337,37 @@ static void devm_rtc_unregister_device(void *data)
 	put_device(&rtc->dev);
 }
 
-static void devm_rtc_release_device(struct device *dev, void *res)
+static void devm_rtc_release_device(void *res)
 {
-	struct rtc_device *rtc = *(struct rtc_device **)res;
+	struct rtc_device *rtc = res;
 
 	put_device(&rtc->dev);
 }
 
 struct rtc_device *devm_rtc_allocate_device(struct device *dev)
 {
-	struct rtc_device **ptr, *rtc;
+	struct rtc_device *rtc;
 	int id, err;
 
 	id = rtc_device_get_id(dev);
 	if (id < 0)
 		return ERR_PTR(id);
 
-	ptr = devres_alloc(devm_rtc_release_device, sizeof(*ptr), GFP_KERNEL);
-	if (!ptr) {
-		err = -ENOMEM;
-		goto exit_ida;
-	}
-
 	rtc = rtc_allocate_device();
 	if (!rtc) {
-		err = -ENOMEM;
-		goto exit_devres;
+		ida_simple_remove(&rtc_ida, id);
+		return ERR_PTR(-ENOMEM);
 	}
 
-	*ptr = rtc;
-	devres_add(dev, ptr);
-
 	rtc->id = id;
 	rtc->dev.parent = dev;
 	dev_set_name(&rtc->dev, "rtc%d", id);
 
-	return rtc;
+	err = devm_add_action_or_reset(dev, devm_rtc_release_device, rtc);
+	if (err)
+		return ERR_PTR(err);
 
-exit_devres:
-	devres_free(ptr);
-exit_ida:
-	ida_simple_remove(&rtc_ida, id);
-	return ERR_PTR(err);
+	return rtc;
 }
 EXPORT_SYMBOL_GPL(devm_rtc_allocate_device);
 
Signature · 1 line
2.29.1
#8 lore raw

PATCH 7/8 rtc: rework rtc_register_device() resource management

In reply to Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

rtc_register_device() is a managed interface but it doesn't use devres by itself - instead it marks an rtc_device as "registered" and the devres callback for devm_rtc_allocate_device() takes care of resource release.

This doesn't correspond with the design behind devres where managed structures should not be aware of being managed. The correct solution here is to register a separate devres callback for unregistering the device.

While at it: rename rtc_register_device() to devm_rtc_register_device() and add it to the list of managed interfaces in devres.rst. This way we can avoid any potential confusion of driver developers who may expect there to exist a corresponding unregister function.

---
 .../driver-api/driver-model/devres.rst        |  1 +
 arch/alpha/kernel/rtc.c                       |  2 +-
 drivers/mfd/menelaus.c                        |  2 +-
 drivers/rtc/class.c                           | 19 +++++++++----------
 drivers/rtc/rtc-88pm80x.c                     |  2 +-
 drivers/rtc/rtc-88pm860x.c                    |  2 +-
 drivers/rtc/rtc-ab-b5ze-s3.c                  |  2 +-
 drivers/rtc/rtc-ab-eoz9.c                     |  2 +-
 drivers/rtc/rtc-ab3100.c                      |  2 +-
 drivers/rtc/rtc-ab8500.c                      |  2 +-
 drivers/rtc/rtc-abx80x.c                      |  2 +-
 drivers/rtc/rtc-ac100.c                       |  2 +-
 drivers/rtc/rtc-armada38x.c                   |  2 +-
 drivers/rtc/rtc-aspeed.c                      |  2 +-
 drivers/rtc/rtc-at91rm9200.c                  |  2 +-
 drivers/rtc/rtc-at91sam9.c                    |  2 +-
 drivers/rtc/rtc-au1xxx.c                      |  2 +-
 drivers/rtc/rtc-bd70528.c                     |  2 +-
 drivers/rtc/rtc-brcmstb-waketimer.c           |  2 +-
 drivers/rtc/rtc-cadence.c                     |  2 +-
 drivers/rtc/rtc-cmos.c                        |  2 +-
 drivers/rtc/rtc-coh901331.c                   |  2 +-
 drivers/rtc/rtc-cpcap.c                       |  2 +-
 drivers/rtc/rtc-cros-ec.c                     |  2 +-
 drivers/rtc/rtc-da9052.c                      |  2 +-
 drivers/rtc/rtc-da9063.c                      |  2 +-
 drivers/rtc/rtc-davinci.c                     |  2 +-
 drivers/rtc/rtc-digicolor.c                   |  2 +-
 drivers/rtc/rtc-dm355evm.c                    |  2 +-
 drivers/rtc/rtc-ds1305.c                      |  2 +-
 drivers/rtc/rtc-ds1307.c                      |  2 +-
 drivers/rtc/rtc-ds1343.c                      |  2 +-
 drivers/rtc/rtc-ds1347.c                      |  2 +-
 drivers/rtc/rtc-ds1374.c                      |  2 +-
 drivers/rtc/rtc-ds1511.c                      |  2 +-
 drivers/rtc/rtc-ds1553.c                      |  2 +-
 drivers/rtc/rtc-ds1672.c                      |  2 +-
 drivers/rtc/rtc-ds1685.c                      |  2 +-
 drivers/rtc/rtc-ds1742.c                      |  2 +-
 drivers/rtc/rtc-ds2404.c                      |  2 +-
 drivers/rtc/rtc-ep93xx.c                      |  2 +-
 drivers/rtc/rtc-fsl-ftm-alarm.c               |  2 +-
 drivers/rtc/rtc-ftrtc010.c                    |  2 +-
 drivers/rtc/rtc-goldfish.c                    |  2 +-
 drivers/rtc/rtc-imx-sc.c                      |  2 +-
 drivers/rtc/rtc-imxdi.c                       |  2 +-
 drivers/rtc/rtc-isl12026.c                    |  2 +-
 drivers/rtc/rtc-isl1208.c                     |  2 +-
 drivers/rtc/rtc-jz4740.c                      |  2 +-
 drivers/rtc/rtc-lpc32xx.c                     |  2 +-
 drivers/rtc/rtc-ls1x.c                        |  2 +-
 drivers/rtc/rtc-m41t80.c                      |  2 +-
 drivers/rtc/rtc-m48t59.c                      |  2 +-
 drivers/rtc/rtc-m48t86.c                      |  2 +-
 drivers/rtc/rtc-mc13xxx.c                     |  2 +-
 drivers/rtc/rtc-meson-vrtc.c                  |  2 +-
 drivers/rtc/rtc-meson.c                       |  2 +-
 drivers/rtc/rtc-mpc5121.c                     |  2 +-
 drivers/rtc/rtc-mrst.c                        |  2 +-
 drivers/rtc/rtc-mt2712.c                      |  2 +-
 drivers/rtc/rtc-mt6397.c                      |  2 +-
 drivers/rtc/rtc-mv.c                          |  2 +-
 drivers/rtc/rtc-mxc.c                         |  2 +-
 drivers/rtc/rtc-mxc_v2.c                      |  2 +-
 drivers/rtc/rtc-omap.c                        |  2 +-
 drivers/rtc/rtc-pcap.c                        |  2 +-
 drivers/rtc/rtc-pcf2123.c                     |  2 +-
 drivers/rtc/rtc-pcf2127.c                     |  2 +-
 drivers/rtc/rtc-pcf85063.c                    |  2 +-
 drivers/rtc/rtc-pcf85363.c                    |  2 +-
 drivers/rtc/rtc-pcf8563.c                     |  2 +-
 drivers/rtc/rtc-pic32.c                       |  2 +-
 drivers/rtc/rtc-pl030.c                       |  2 +-
 drivers/rtc/rtc-pl031.c                       |  2 +-
 drivers/rtc/rtc-pm8xxx.c                      |  2 +-
 drivers/rtc/rtc-ps3.c                         |  2 +-
 drivers/rtc/rtc-r9701.c                       |  2 +-
 drivers/rtc/rtc-rc5t619.c                     |  2 +-
 drivers/rtc/rtc-rk808.c                       |  2 +-
 drivers/rtc/rtc-rp5c01.c                      |  2 +-
 drivers/rtc/rtc-rs5c348.c                     |  2 +-
 drivers/rtc/rtc-rv3028.c                      |  2 +-
 drivers/rtc/rtc-rv3029c2.c                    |  2 +-
 drivers/rtc/rtc-rv3032.c                      |  2 +-
 drivers/rtc/rtc-rv8803.c                      |  2 +-
 drivers/rtc/rtc-rx8010.c                      |  2 +-
 drivers/rtc/rtc-rx8581.c                      |  2 +-
 drivers/rtc/rtc-s35390a.c                     |  2 +-
 drivers/rtc/rtc-sa1100.c                      |  2 +-
 drivers/rtc/rtc-sc27xx.c                      |  2 +-
 drivers/rtc/rtc-sd3078.c                      |  2 +-
 drivers/rtc/rtc-sh.c                          |  2 +-
 drivers/rtc/rtc-sirfsoc.c                     |  2 +-
 drivers/rtc/rtc-snvs.c                        |  2 +-
 drivers/rtc/rtc-st-lpc.c                      |  2 +-
 drivers/rtc/rtc-starfire.c                    |  2 +-
 drivers/rtc/rtc-stk17ta8.c                    |  2 +-
 drivers/rtc/rtc-stmp3xxx.c                    |  2 +-
 drivers/rtc/rtc-sun4v.c                       |  2 +-
 drivers/rtc/rtc-sun6i.c                       |  2 +-
 drivers/rtc/rtc-sunxi.c                       |  2 +-
 drivers/rtc/rtc-tegra.c                       |  2 +-
 drivers/rtc/rtc-test.c                        |  2 +-
 drivers/rtc/rtc-tps6586x.c                    |  2 +-
 drivers/rtc/rtc-tps65910.c                    |  2 +-
 drivers/rtc/rtc-tx4939.c                      |  2 +-
 drivers/rtc/rtc-vr41xx.c                      |  2 +-
 drivers/rtc/rtc-vt8500.c                      |  2 +-
 drivers/rtc/rtc-wilco-ec.c                    |  2 +-
 drivers/rtc/rtc-wm831x.c                      |  2 +-
 drivers/rtc/rtc-xgene.c                       |  2 +-
 drivers/rtc/rtc-zynqmp.c                      |  2 +-
 drivers/rtc/sysfs.c                           |  2 --
 include/linux/rtc.h                           |  8 +++-----
 114 files changed, 123 insertions(+), 127 deletions(-)
Documentation/driver-api/driver-model/devres.rst +1 -0
index 5df7ba54a4ba..cd8b6e657b94 100644
@@ -414,6 +414,7 @@ RESET
 RTC
   devm_rtc_device_register()
   devm_rtc_allocate_device()
+  devm_rtc_register_device()
   devm_rtc_nvmem_register()
 
 SERDEV
arch/alpha/kernel/rtc.c +1 -1
index 1b1d5963ac55..ce3077946e1d 100644
@@ -216,6 +216,6 @@ alpha_rtc_init(void)
 		rtc->ops = &remote_rtc_ops;
 #endif
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 device_initcall(alpha_rtc_init);
drivers/mfd/menelaus.c +1 -1
index b64d3315a5e1..07e0ca2e467c 100644
@@ -1119,7 +1119,7 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m)
 		menelaus_write_reg(MENELAUS_RTC_CTRL, m->rtc_control);
 	}
 
-	err = rtc_register_device(m->rtc);
+	err = devm_rtc_register_device(m->rtc);
 	if (err) {
 		if (alarm) {
 			menelaus_remove_irq_work(MENELAUS_RTCALM_IRQ);
drivers/rtc/class.c +9 -10
index a99b7d24b77c..b8a34ee039ad 100644
@@ -321,8 +321,10 @@ static void rtc_device_get_offset(struct rtc_device *rtc)
  *
  * @rtc: the RTC class device to destroy
  */
-static void rtc_device_unregister(struct rtc_device *rtc)
+static void devm_rtc_unregister_device(void *data)
 {
+	struct rtc_device *rtc = data;
+
 	mutex_lock(&rtc->ops_lock);
 	/*
 	 * Remove innards of this RTC, then disable it, before
@@ -339,10 +341,7 @@ static void devm_rtc_release_device(struct device *dev, void *res)
 {
 	struct rtc_device *rtc = *(struct rtc_device **)res;
 
-	if (rtc->registered)
-		rtc_device_unregister(rtc);
-	else
-		put_device(&rtc->dev);
+	put_device(&rtc->dev);
 }
 
 struct rtc_device *devm_rtc_allocate_device(struct device *dev)
@@ -383,7 +382,7 @@ struct rtc_device *devm_rtc_allocate_device(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(devm_rtc_allocate_device);
 
-int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
+int __devm_rtc_register_device(struct module *owner, struct rtc_device *rtc)
 {
 	struct rtc_wkalrm alrm;
 	int err;
@@ -413,7 +412,6 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
 
 	rtc_proc_add_device(rtc);
 
-	rtc->registered = true;
 	dev_info(rtc->dev.parent, "registered as %s\n",
 		 dev_name(&rtc->dev));
 
@@ -422,9 +420,10 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
 		rtc_hctosys(rtc);
 #endif
 
-	return 0;
+	return devm_add_action_or_reset(rtc->dev.parent,
+					devm_rtc_unregister_device, rtc);
 }
-EXPORT_SYMBOL_GPL(__rtc_register_device);
+EXPORT_SYMBOL_GPL(__devm_rtc_register_device);
 
 /**
  * devm_rtc_device_register - resource managed rtc_device_register()
@@ -454,7 +453,7 @@ struct rtc_device *devm_rtc_device_register(struct device *dev,
 
 	rtc->ops = ops;
 
-	err = __rtc_register_device(owner, rtc);
+	err = __devm_rtc_register_device(owner, rtc);
 	if (err)
 		return ERR_PTR(err);
 
drivers/rtc/rtc-88pm80x.c +1 -1
index 75779e8501a3..6a3f44cf6ebe 100644
@@ -294,7 +294,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
 	info->rtc_dev->ops = &pm80x_rtc_ops;
 	info->rtc_dev->range_max = U32_MAX;
 
-	ret = rtc_register_device(info->rtc_dev);
+	ret = devm_rtc_register_device(info->rtc_dev);
 	if (ret)
 		goto out_rtc;
 
drivers/rtc/rtc-88pm860x.c +1 -1
index c90457d001e9..2c809a1a445e 100644
@@ -307,7 +307,7 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
 	info->rtc_dev->ops = &pm860x_rtc_ops;
 	info->rtc_dev->range_max = U32_MAX;
 
-	ret = rtc_register_device(info->rtc_dev);
+	ret = devm_rtc_register_device(info->rtc_dev);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ab-b5ze-s3.c +1 -1
index 2370ac0cdb5f..6e3e320dc727 100644
@@ -892,7 +892,7 @@ static int abb5zes3_probe(struct i2c_client *client,
 		}
 	}
 
-	ret = rtc_register_device(data->rtc);
+	ret = devm_rtc_register_device(data->rtc);
 
 err:
 	if (ret && data->irq)
drivers/rtc/rtc-ab-eoz9.c +1 -1
index d690985caa4c..b20d8f26dcdb 100644
@@ -420,7 +420,7 @@ static int abeoz9_probe(struct i2c_client *client,
 	data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	data->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(data->rtc);
+	ret = devm_rtc_register_device(data->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ab3100.c +1 -1
index 2ed6def90975..e4fd961e8bf6 100644
@@ -238,7 +238,7 @@ static int __init ab3100_rtc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver ab3100_rtc_driver = {
drivers/rtc/rtc-ab8500.c +1 -1
index 3d60f3283f11..b40048871295 100644
@@ -404,7 +404,7 @@ static int ab8500_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static int ab8500_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-abx80x.c +1 -1
index 803725b3a02c..6733bb0df674 100644
@@ -851,7 +851,7 @@ static int abx80x_probe(struct i2c_client *client,
 		return err;
 	}
 
-	return rtc_register_device(priv->rtc);
+	return devm_rtc_register_device(priv->rtc);
 }
 
 static const struct i2c_device_id abx80x_id[] = {
drivers/rtc/rtc-ac100.c +1 -1
index 29223931aba7..1ddbef99e38f 100644
@@ -610,7 +610,7 @@ static int ac100_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(chip->rtc);
+	return devm_rtc_register_device(chip->rtc);
 }
 
 static int ac100_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-armada38x.c +1 -1
index 94d7c22fc4f3..807a79c07f08 100644
@@ -556,7 +556,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
 
 	rtc->rtc_dev->range_max = U32_MAX;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-aspeed.c +1 -1
index eacdd0637cce..a93352ed3aec 100644
@@ -104,7 +104,7 @@ static int aspeed_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->range_min = RTC_TIMESTAMP_BEGIN_1900;
 	rtc->rtc_dev->range_max = 38814989399LL; /* 3199-12-31 23:59:59 */
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id aspeed_rtc_match[] = {
drivers/rtc/rtc-at91rm9200.c +1 -1
index 5e811e04cb21..ba49cc095aef 100644
@@ -440,7 +440,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
 	rtc->ops = &at91_rtc_ops;
 	rtc->range_min = RTC_TIMESTAMP_BEGIN_1900;
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 	if (ret)
 		goto err_clk;
 
drivers/rtc/rtc-at91sam9.c +1 -1
index e39e89867d29..2216be429ab7 100644
@@ -431,7 +431,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
 		dev_warn(&pdev->dev, "%s: SET TIME!\n",
 			 dev_name(&rtc->rtcdev->dev));
 
-	return rtc_register_device(rtc->rtcdev);
+	return devm_rtc_register_device(rtc->rtcdev);
 
 err_clk:
 	clk_disable_unprepare(rtc->sclk);
drivers/rtc/rtc-au1xxx.c +1 -1
index 791bebcb6f47..e6428b27b5d4 100644
@@ -104,7 +104,7 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtcdev);
 
-	return rtc_register_device(rtcdev);
+	return devm_rtc_register_device(rtcdev);
 }
 
 static struct platform_driver au1xrtc_driver = {
drivers/rtc/rtc-bd70528.c +1 -1
index 4492b770422c..17cb67f5bf6e 100644
@@ -604,7 +604,7 @@ static int bd70528_probe(struct platform_device *pdev)
 		}
 	}
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static const struct platform_device_id bd718x7_rtc_id[] = {
drivers/rtc/rtc-brcmstb-waketimer.c +1 -1
index 4fee57c51280..560465b57419 100644
@@ -252,7 +252,7 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
 	timer->rtc->ops = &brcmstb_waketmr_ops;
 	timer->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(timer->rtc);
+	ret = devm_rtc_register_device(timer->rtc);
 	if (ret)
 		goto err_notifier;
 
drivers/rtc/rtc-cadence.c +1 -1
index 595d5d252850..1edf7f16d73a 100644
@@ -336,7 +336,7 @@ static int cdns_rtc_probe(struct platform_device *pdev)
 	writel(0, crtc->regs + CDNS_RTC_HMR);
 	writel(CDNS_RTC_KRTCR_KRTC, crtc->regs + CDNS_RTC_KRTCR);
 
-	ret = rtc_register_device(crtc->rtc_dev);
+	ret = devm_rtc_register_device(crtc->rtc_dev);
 	if (ret)
 		goto err_disable_wakeup;
 
drivers/rtc/rtc-cmos.c +1 -1
index 766074c04b53..83415600185c 100644
@@ -863,7 +863,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 		cmos_rtc.rtc->ops = &cmos_rtc_ops_no_alarm;
 	}
 
-	retval = rtc_register_device(cmos_rtc.rtc);
+	retval = devm_rtc_register_device(cmos_rtc.rtc);
 	if (retval)
 		goto cleanup2;
 
drivers/rtc/rtc-coh901331.c +1 -1
index da59917c9ee8..168ced87d93a 100644
@@ -203,7 +203,7 @@ static int __init coh901331_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtap);
 
-	ret = rtc_register_device(rtap->rtc);
+	ret = devm_rtc_register_device(rtap->rtc);
 	if (ret)
 		goto out_no_rtc;
 
drivers/rtc/rtc-cpcap.c +1 -1
index 800667d73a6f..8f8369507103 100644
@@ -299,7 +299,7 @@ static int cpcap_rtc_probe(struct platform_device *pdev)
 		/* ignore error and continue without wakeup support */
 	}
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id cpcap_rtc_of_match[] = {
drivers/rtc/rtc-cros-ec.c +1 -1
index f7343c289cab..70626793ca69 100644
@@ -350,7 +350,7 @@ static int cros_ec_rtc_probe(struct platform_device *pdev)
 	cros_ec_rtc->rtc->ops = &cros_ec_rtc_ops;
 	cros_ec_rtc->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(cros_ec_rtc->rtc);
+	ret = devm_rtc_register_device(cros_ec_rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-da9052.c +1 -1
index 58de10da37b1..9ca99bd35702 100644
@@ -304,7 +304,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 	rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rtc->rtc->range_max = RTC_TIMESTAMP_END_2063;
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-da9063.c +1 -1
index 046b1d4c3dae..03a55a3e2433 100644
@@ -494,7 +494,7 @@ static int da9063_rtc_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "Failed to request ALARM IRQ %d: %d\n",
 			irq_alarm, ret);
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static struct platform_driver da9063_rtc_driver = {
drivers/rtc/rtc-davinci.c +1 -1
index 73f87a17cdf3..6bef0f2353da 100644
@@ -484,7 +484,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
 
 	device_init_wakeup(&pdev->dev, 0);
 
-	return rtc_register_device(davinci_rtc->rtc);
+	return devm_rtc_register_device(davinci_rtc->rtc);
 }
 
 static int __exit davinci_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-digicolor.c +1 -1
index 200d85b01e8b..4fdfa5b6feb2 100644
@@ -202,7 +202,7 @@ static int __init dc_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->ops = &dc_rtc_ops;
 	rtc->rtc_dev->range_max = U32_MAX;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id dc_dt_ids[] = {
drivers/rtc/rtc-dm355evm.c +1 -1
index cd947a20843b..94fb16ac3e0f 100644
@@ -132,7 +132,7 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
 	rtc->ops = &dm355evm_rtc_ops;
 	rtc->range_max = U32_MAX;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 /*
drivers/rtc/rtc-ds1305.c +1 -1
index a4e768261b43..8c2ab29c3d91 100644
@@ -694,7 +694,7 @@ static int ds1305_probe(struct spi_device *spi)
 	ds1305->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
 	ds1305_nvmem_cfg.priv = ds1305;
-	status = rtc_register_device(ds1305->rtc);
+	status = devm_rtc_register_device(ds1305->rtc);
 	if (status)
 		return status;
 
drivers/rtc/rtc-ds1307.c +1 -1
index 1dc377e0b225..97b086441b17 100644
@@ -2032,7 +2032,7 @@ static int ds1307_probe(struct i2c_client *client,
 	if (err)
 		return err;
 
-	err = rtc_register_device(ds1307->rtc);
+	err = devm_rtc_register_device(ds1307->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-ds1343.c +1 -1
index ea663e24a34c..f14ed6c96437 100644
@@ -408,7 +408,7 @@ static int ds1343_probe(struct spi_device *spi)
 		dev_err(&spi->dev,
 			"unable to create sysfs entries for rtc ds1343\n");
 
-	res = rtc_register_device(priv->rtc);
+	res = devm_rtc_register_device(priv->rtc);
 	if (res)
 		return res;
 
drivers/rtc/rtc-ds1347.c +1 -1
index 7025cf3fb9f8..157bf5209ac4 100644
@@ -166,7 +166,7 @@ static int ds1347_probe(struct spi_device *spi)
 	rtc->range_min = RTC_TIMESTAMP_BEGIN_0000;
 	rtc->range_max = RTC_TIMESTAMP_END_9999;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct spi_driver ds1347_driver = {
drivers/rtc/rtc-ds1374.c +1 -1
index 177d870bda0d..fab79921a712 100644
@@ -508,7 +508,7 @@ static int ds1374_probe(struct i2c_client *client,
 	ds1374->rtc->ops = &ds1374_rtc_ops;
 	ds1374->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(ds1374->rtc);
+	ret = devm_rtc_register_device(ds1374->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1511.c +1 -1
index d5f48216e851..bda884333082 100644
@@ -466,7 +466,7 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
 
 	pdata->rtc->ops = &ds1511_rtc_ops;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1553.c +1 -1
index bb40ea8b6373..dbff5b621ef5 100644
@@ -295,7 +295,7 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
 
 	pdata->rtc->ops = &ds1553_rtc_ops;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1672.c +1 -1
index 9da84df9f152..630493759d15 100644
@@ -124,7 +124,7 @@ static int ds1672_probe(struct i2c_client *client,
 	rtc->ops = &ds1672_rtc_ops;
 	rtc->range_max = U32_MAX;
 
-	err = rtc_register_device(rtc);
+	err = devm_rtc_register_device(rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-ds1685.c +1 -1
index bef588fce266..d69c807af29b 100644
@@ -1321,7 +1321,7 @@ ds1685_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(rtc_dev);
+	return devm_rtc_register_device(rtc_dev);
 }
 
 /**
drivers/rtc/rtc-ds1742.c +1 -1
index 39c6c3a85b34..13d45c697da6 100644
@@ -191,7 +191,7 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
 
 	rtc->ops = &ds1742_rtc_ops;
 
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds2404.c +1 -1
index 9df0c44512b8..0480f592307e 100644
@@ -234,7 +234,7 @@ static int rtc_probe(struct platform_device *pdev)
 	chip->rtc->ops = &ds2404_rtc_ops;
 	chip->rtc->range_max = U32_MAX;
 
-	retval = rtc_register_device(chip->rtc);
+	retval = devm_rtc_register_device(chip->rtc);
 	if (retval)
 		return retval;
 
drivers/rtc/rtc-ep93xx.c +1 -1
index 8ec9ea1ca72e..9a5a15cbcd9b 100644
@@ -145,7 +145,7 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(ep93xx_rtc->rtc);
+	return devm_rtc_register_device(ep93xx_rtc->rtc);
 }
 
 static struct platform_driver ep93xx_rtc_driver = {
drivers/rtc/rtc-fsl-ftm-alarm.c +1 -1
index 48d3b38ea348..57cc09d0a806 100644
@@ -290,7 +290,7 @@ static int ftm_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		dev_err(&pdev->dev, "failed to enable irq wake\n");
 
-	ret = rtc_register_device(rtc->rtc_dev);
+	ret = devm_rtc_register_device(rtc->rtc_dev);
 	if (ret) {
 		dev_err(&pdev->dev, "can't register rtc device\n");
 		return ret;
drivers/rtc/rtc-ftrtc010.c +1 -1
index 0919f7dc94a3..ad3add5db4c8 100644
@@ -176,7 +176,7 @@ static int ftrtc010_rtc_probe(struct platform_device *pdev)
 	if (unlikely(ret))
 		return ret;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static int ftrtc010_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-goldfish.c +1 -1
index 6349d2cd3680..7ab95d052644 100644
@@ -194,7 +194,7 @@ static int goldfish_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(rtcdrv->rtc);
+	return devm_rtc_register_device(rtcdrv->rtc);
 }
 
 static const struct of_device_id goldfish_rtc_of_match[] = {
drivers/rtc/rtc-imx-sc.c +1 -1
index a5f59e6f862e..cc9fbab49999 100644
@@ -166,7 +166,7 @@ static int imx_sc_rtc_probe(struct platform_device *pdev)
 	imx_sc_rtc->range_min = 0;
 	imx_sc_rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(imx_sc_rtc);
+	ret = devm_rtc_register_device(imx_sc_rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-imxdi.c +1 -1
index 8d141d8a5490..c2692da74e09 100644
@@ -814,7 +814,7 @@ static int __init dryice_rtc_probe(struct platform_device *pdev)
 	imxdi->rtc->ops = &dryice_rtc_ops;
 	imxdi->rtc->range_max = U32_MAX;
 
-	rc = rtc_register_device(imxdi->rtc);
+	rc = devm_rtc_register_device(imxdi->rtc);
 	if (rc)
 		goto err;
 
drivers/rtc/rtc-isl12026.c +1 -1
index fff8d8253669..1fc6627d854d 100644
@@ -469,7 +469,7 @@ static int isl12026_probe_new(struct i2c_client *client)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(priv->rtc);
+	return devm_rtc_register_device(priv->rtc);
 }
 
 static int isl12026_remove(struct i2c_client *client)
drivers/rtc/rtc-isl1208.c +1 -1
index 08d778b10e9e..563a6d9c9fcf 100644
@@ -894,7 +894,7 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	if (rc)
 		return rc;
 
-	return rtc_register_device(isl1208->rtc);
+	return devm_rtc_register_device(isl1208->rtc);
 }
 
 static struct i2c_driver isl1208_driver = {
drivers/rtc/rtc-jz4740.c +1 -1
index 9607e6b6e0b3..6e51df72fd65 100644
@@ -375,7 +375,7 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
 	/* Each 1 Hz pulse should happen after (rate) ticks */
 	jz4740_rtc_reg_write(rtc, JZ_REG_RTC_REGULATOR, rate - 1);
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-lpc32xx.c +1 -1
index 15d8abda81fe..76ad7031a13d 100644
@@ -239,7 +239,7 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)
 	rtc->rtc->ops = &lpc32xx_rtc_ops;
 	rtc->rtc->range_max = U32_MAX;
 
-	err = rtc_register_device(rtc->rtc);
+	err = devm_rtc_register_device(rtc->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-ls1x.c +1 -1
index 8bd34056fea0..5af26dc5c2a3 100644
@@ -176,7 +176,7 @@ static int ls1x_rtc_probe(struct platform_device *pdev)
 	rtcdev->range_min = RTC_TIMESTAMP_BEGIN_1900;
 	rtcdev->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(rtcdev);
+	return devm_rtc_register_device(rtcdev);
 }
 
 static struct platform_driver  ls1x_rtc_driver = {
drivers/rtc/rtc-m41t80.c +1 -1
index 8a89bc52b0d4..160dcf68e64e 100644
@@ -977,7 +977,7 @@ static int m41t80_probe(struct i2c_client *client,
 		m41t80_sqw_register_clk(m41t80_data);
 #endif
 
-	rc = rtc_register_device(m41t80_data->rtc);
+	rc = devm_rtc_register_device(m41t80_data->rtc);
 	if (rc)
 		return rc;
 
drivers/rtc/rtc-m48t59.c +1 -1
index e966a66ab2d3..5f5898d3b055 100644
@@ -470,7 +470,7 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	ret = rtc_register_device(m48t59->rtc);
+	ret = devm_rtc_register_device(m48t59->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-m48t86.c +1 -1
index 182cfe59e4e0..481c9525b1dd 100644
@@ -255,7 +255,7 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
 
 	info->rtc->ops = &m48t86_rtc_ops;
 
-	err = rtc_register_device(info->rtc);
+	err = devm_rtc_register_device(info->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-mc13xxx.c +1 -1
index d6802e6191cb..d4234e78497e 100644
@@ -307,7 +307,7 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
 
 	mc13xxx_unlock(mc13xxx);
 
-	ret = rtc_register_device(priv->rtc);
+	ret = devm_rtc_register_device(priv->rtc);
 	if (ret) {
 		mc13xxx_lock(mc13xxx);
 		goto err_irq_request;
drivers/rtc/rtc-meson-vrtc.c +1 -1
index e6bd0808a092..1463c8621561 100644
@@ -83,7 +83,7 @@ static int meson_vrtc_probe(struct platform_device *pdev)
 		return PTR_ERR(vrtc->rtc);
 
 	vrtc->rtc->ops = &meson_vrtc_ops;
-	return rtc_register_device(vrtc->rtc);
+	return devm_rtc_register_device(vrtc->rtc);
 }
 
 static int __maybe_unused meson_vrtc_suspend(struct device *dev)
drivers/rtc/rtc-meson.c +1 -1
index 938267713a4d..8642c06565ea 100644
@@ -369,7 +369,7 @@ static int meson_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		goto out_disable_vdd;
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto out_disable_vdd;
 
drivers/rtc/rtc-mpc5121.c +1 -1
index 5c2ce71aa044..bb2ea9bc56f2 100644
@@ -371,7 +371,7 @@ static int mpc5121_rtc_probe(struct platform_device *op)
 		rtc->rtc->range_max = U32_MAX;
 	}
 
-	err = rtc_register_device(rtc->rtc);
+	err = devm_rtc_register_device(rtc->rtc);
 	if (err)
 		goto out_dispose2;
 
drivers/rtc/rtc-mrst.c +1 -1
index 17bf5394e1e5..421b3b6071b6 100644
@@ -361,7 +361,7 @@ static int vrtc_mrst_do_probe(struct device *dev, struct resource *iomem,
 		}
 	}
 
-	retval = rtc_register_device(mrst_rtc.rtc);
+	retval = devm_rtc_register_device(mrst_rtc.rtc);
 	if (retval)
 		goto cleanup0;
 
drivers/rtc/rtc-mt2712.c +1 -1
index d5f691c8a035..cd92a9788351 100644
@@ -352,7 +352,7 @@ static int mt2712_rtc_probe(struct platform_device *pdev)
 	mt2712_rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	mt2712_rtc->rtc->range_max = MT2712_RTC_TIMESTAMP_END_2127;
 
-	return rtc_register_device(mt2712_rtc->rtc);
+	return devm_rtc_register_device(mt2712_rtc->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-mt6397.c +1 -1
index 1894aded4c85..6655035e5164 100644
@@ -301,7 +301,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)
 
 	rtc->rtc_dev->ops = &mtk_rtc_ops;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-mv.c +1 -1
index d5f190e578e4..f8e2ecea1d8d 100644
@@ -278,7 +278,7 @@ static int __init mv_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	pdata->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (!ret)
 		return 0;
 out:
drivers/rtc/rtc-mxc.c +1 -1
index a8cfbde048f4..85e23efb8433 100644
@@ -428,7 +428,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev, "failed to enable irq wake\n");
 	}
 
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 
 	return ret;
 }
drivers/rtc/rtc-mxc_v2.c +1 -1
index 91534560fe2a..0d73f6f0cf9e 100644
@@ -354,7 +354,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret < 0)
 		clk_unprepare(pdata->clk);
 
drivers/rtc/rtc-omap.c +1 -1
index e65f79fc7718..dc7db2477f88 100644
@@ -886,7 +886,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto err;
 
drivers/rtc/rtc-pcap.c +1 -1
index 178bfb1dea21..8c7a98a5452c 100644
@@ -163,7 +163,7 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(pcap_rtc->rtc);
+	return devm_rtc_register_device(pcap_rtc->rtc);
 }
 
 static int __exit pcap_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-pcf2123.c +1 -1
index c3691fa4210e..534ffc91eec1 100644
@@ -434,7 +434,7 @@ static int pcf2123_probe(struct spi_device *spi)
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rtc->set_start_time = true;
 
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-pcf2127.c +1 -1
index b803bbbca7b8..c19377fe1f71 100644
@@ -680,7 +680,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
 		return ret;
 	}
 
-	return rtc_register_device(pcf2127->rtc);
+	return devm_rtc_register_device(pcf2127->rtc);
 }
 
 #ifdef CONFIG_OF
drivers/rtc/rtc-pcf85063.c +1 -1
index c19f139e9b8d..e19cf2adbc35 100644
@@ -614,7 +614,7 @@ static int pcf85063_probe(struct i2c_client *client)
 	pcf85063_clkout_register_clk(pcf85063);
 #endif
 
-	return rtc_register_device(pcf85063->rtc);
+	return devm_rtc_register_device(pcf85063->rtc);
 }
 
 #ifdef CONFIG_OF
drivers/rtc/rtc-pcf85363.c +1 -1
index 23cf14ca2c96..a574c8d15a5c 100644
@@ -418,7 +418,7 @@ static int pcf85363_probe(struct i2c_client *client,
 			pcf85363->rtc->ops = &rtc_ops_alarm;
 	}
 
-	ret = rtc_register_device(pcf85363->rtc);
+	ret = devm_rtc_register_device(pcf85363->rtc);
 
 	for (i = 0; i < config->num_nvram; i++) {
 		nvmem_cfg[i].priv = pcf85363;
drivers/rtc/rtc-pcf8563.c +1 -1
index 2dc30eafa639..de3e6c355f2e 100644
@@ -582,7 +582,7 @@ static int pcf8563_probe(struct i2c_client *client,
 		}
 	}
 
-	err = rtc_register_device(pcf8563->rtc);
+	err = devm_rtc_register_device(pcf8563->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-pic32.c +1 -1
index 2b6946744654..7fb9145c43bd 100644
@@ -338,7 +338,7 @@ static int pic32_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	pdata->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret)
 		goto err_nortc;
 
drivers/rtc/rtc-pl030.c +1 -1
index ebe03eba8f5f..5a880516f3e8 100644
@@ -121,7 +121,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
 	if (ret)
 		goto err_irq;
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto err_reg;
 
drivers/rtc/rtc-pl031.c +1 -1
index c6b89273feba..041a60365048 100644
@@ -368,7 +368,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 	ldata->rtc->range_min = vendor->range_min;
 	ldata->rtc->range_max = vendor->range_max;
 
-	ret = rtc_register_device(ldata->rtc);
+	ret = devm_rtc_register_device(ldata->rtc);
 	if (ret)
 		goto out;
 
drivers/rtc/rtc-pm8xxx.c +1 -1
index b45ee2cb2c04..0d9dd6faabba 100644
@@ -508,7 +508,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
 		return rc;
 	}
 
-	return rtc_register_device(rtc_dd->rtc);
+	return devm_rtc_register_device(rtc_dd->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-ps3.c +1 -1
index f0336d691e6c..6b098734c715 100644
@@ -56,7 +56,7 @@ static int __init ps3_rtc_probe(struct platform_device *dev)
 
 	platform_set_drvdata(dev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver ps3_rtc_driver = {
drivers/rtc/rtc-r9701.c +1 -1
index 7ceb968f0e44..60a3c3d7499b 100644
@@ -127,7 +127,7 @@ static int r9701_probe(struct spi_device *spi)
 	rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct spi_driver r9701_driver = {
drivers/rtc/rtc-rc5t619.c +1 -1
index dd1a20977478..e73102a39f1b 100644
@@ -426,7 +426,7 @@ static int rc5t619_rtc_probe(struct platform_device *pdev)
 		dev_warn(&pdev->dev, "rc5t619 interrupt is disabled\n");
 	}
 
-	return rtc_register_device(rtc->rtc);
+	return devm_rtc_register_device(rtc->rtc);
 }
 
 static struct platform_driver rc5t619_rtc_driver = {
drivers/rtc/rtc-rk808.c +1 -1
index c0334c602e88..e920da8c08da 100644
@@ -447,7 +447,7 @@ static int rk808_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	return rtc_register_device(rk808_rtc->rtc);
+	return devm_rtc_register_device(rk808_rtc->rtc);
 }
 
 static struct platform_driver rk808_rtc_driver = {
drivers/rtc/rtc-rp5c01.c +1 -1
index 8bc476c0905f..44afa6d996e7 100644
@@ -259,7 +259,7 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 	if (error)
 		return error;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver rp5c01_rtc_driver = {
drivers/rtc/rtc-rs5c348.c +1 -1
index 47c13678449e..fec633f80789 100644
@@ -197,7 +197,7 @@ static int rs5c348_probe(struct spi_device *spi)
 
 	rtc->ops = &rs5c348_rtc_ops;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct spi_driver rs5c348_driver = {
drivers/rtc/rtc-rv3028.c +1 -1
index f788df979750..979407a51c7a 100644
@@ -886,7 +886,7 @@ static int rv3028_probe(struct i2c_client *client)
 	rv3028->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv3028->rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rv3028->rtc->ops = &rv3028_rtc_ops;
-	ret = rtc_register_device(rv3028->rtc);
+	ret = devm_rtc_register_device(rv3028->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-rv3029c2.c +1 -1
index ad359b3b74b2..dc1bda62095e 100644
@@ -750,7 +750,7 @@ static int rv3029_probe(struct device *dev, struct regmap *regmap, int irq,
 	rv3029->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv3029->rtc->range_max = RTC_TIMESTAMP_END_2079;
 
-	rc = rtc_register_device(rv3029->rtc);
+	rc = devm_rtc_register_device(rv3029->rtc);
 	if (rc)
 		return rc;
 
drivers/rtc/rtc-rv3032.c +1 -1
index c95fa7cd0bfe..09d9527a3637 100644
@@ -885,7 +885,7 @@ static int rv3032_probe(struct i2c_client *client)
 	rv3032->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv3032->rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rv3032->rtc->ops = &rv3032_rtc_ops;
-	ret = rtc_register_device(rv3032->rtc);
+	ret = devm_rtc_register_device(rv3032->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-rv8803.c +1 -1
index 44e1818a751c..d4ea6db51b26 100644
@@ -587,7 +587,7 @@ static int rv8803_probe(struct i2c_client *client,
 	rv8803->rtc->ops = &rv8803_rtc_ops;
 	rv8803->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv8803->rtc->range_max = RTC_TIMESTAMP_END_2099;
-	err = rtc_register_device(rv8803->rtc);
+	err = devm_rtc_register_device(rv8803->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-rx8010.c +1 -1
index dca41a2a39b2..8340ab47a059 100644
@@ -419,7 +419,7 @@ static int rx8010_probe(struct i2c_client *client)
 	rx8010->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rx8010->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(rx8010->rtc);
+	return devm_rtc_register_device(rx8010->rtc);
 }
 
 static struct i2c_driver rx8010_driver = {
drivers/rtc/rtc-rx8581.c +1 -1
index 017f74721cc0..de109139529b 100644
@@ -298,7 +298,7 @@ static int rx8581_probe(struct i2c_client *client,
 	rx8581->rtc->start_secs = 0;
 	rx8581->rtc->set_start_time = true;
 
-	ret = rtc_register_device(rx8581->rtc);
+	ret = devm_rtc_register_device(rx8581->rtc);
 
 	for (i = 0; i < config->num_nvram; i++) {
 		nvmem_cfg[i].priv = rx8581;
drivers/rtc/rtc-s35390a.c +1 -1
index 03672a246356..ea15d0392bb9 100644
@@ -497,7 +497,7 @@ static int s35390a_probe(struct i2c_client *client,
 	if (status1 & S35390A_FLAG_INT2)
 		rtc_update_irq(s35390a->rtc, 1, RTC_AF);
 
-	return rtc_register_device(s35390a->rtc);
+	return devm_rtc_register_device(s35390a->rtc);
 }
 
 static struct i2c_driver s35390a_driver = {
drivers/rtc/rtc-sa1100.c +1 -1
index 9ccc97cf5e09..1250887e4382 100644
@@ -205,7 +205,7 @@ int sa1100_rtc_init(struct platform_device *pdev, struct sa1100_rtc *info)
 	info->rtc->max_user_freq = RTC_FREQ;
 	info->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(info->rtc);
+	ret = devm_rtc_register_device(info->rtc);
 	if (ret) {
 		clk_disable_unprepare(info->clk);
 		return ret;
drivers/rtc/rtc-sc27xx.c +1 -1
index 8e3d6be990c5..324398fefc4f 100644
@@ -648,7 +648,7 @@ static int sprd_rtc_probe(struct platform_device *pdev)
 	rtc->rtc->ops = &sprd_rtc_ops;
 	rtc->rtc->range_min = 0;
 	rtc->rtc->range_max = 5662310399LL;
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret) {
 		device_init_wakeup(&pdev->dev, 0);
 		return ret;
drivers/rtc/rtc-sd3078.c +1 -1
index a7aa943c1183..f6bee69ba017 100644
@@ -192,7 +192,7 @@ static int sd3078_probe(struct i2c_client *client,
 	sd3078->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	sd3078->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(sd3078->rtc);
+	ret = devm_rtc_register_device(sd3078->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-sh.c +1 -1
index 9167b48014a1..cd146b574143 100644
@@ -607,7 +607,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
 		rtc->rtc_dev->range_max = mktime64(2098, 12, 31, 23, 59, 59);
 	}
 
-	ret = rtc_register_device(rtc->rtc_dev);
+	ret = devm_rtc_register_device(rtc->rtc_dev);
 	if (ret)
 		goto err_unmap;
 
drivers/rtc/rtc-sirfsoc.c +1 -1
index abf19435dbad..03a6cca23201 100644
@@ -356,7 +356,7 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	return rtc_register_device(rtcdrv->rtc);
+	return devm_rtc_register_device(rtcdrv->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-snvs.c +1 -1
index 0263d996b8a8..b5f1791a7255 100644
@@ -405,7 +405,7 @@ static int snvs_rtc_probe(struct platform_device *pdev)
 	data->rtc->ops = &snvs_rtc_ops;
 	data->rtc->range_max = U32_MAX;
 
-	return rtc_register_device(data->rtc);
+	return devm_rtc_register_device(data->rtc);
 }
 
 static int __maybe_unused snvs_rtc_suspend_noirq(struct device *dev)
drivers/rtc/rtc-st-lpc.c +1 -1
index 0c65448b85ee..bdb20f63254e 100644
@@ -250,7 +250,7 @@ static int st_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->range_max = U64_MAX;
 	do_div(rtc->rtc_dev->range_max, rtc->clkrate);
 
-	ret = rtc_register_device(rtc->rtc_dev);
+	ret = devm_rtc_register_device(rtc->rtc_dev);
 	if (ret) {
 		clk_disable_unprepare(rtc->clk);
 		return ret;
drivers/rtc/rtc-starfire.c +1 -1
index 37a26279e107..fbd1ed41cbf1 100644
@@ -48,7 +48,7 @@ static int __init starfire_rtc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver starfire_rtc_driver = {
drivers/rtc/rtc-stk17ta8.c +1 -1
index ad616bce7bca..7cb6be1b7815 100644
@@ -317,7 +317,7 @@ static int stk17ta8_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(pdata->rtc);
+	return devm_rtc_register_device(pdata->rtc);
 }
 
 /* work with hotplug and coldplug */
drivers/rtc/rtc-stmp3xxx.c +1 -1
index 0a969af80af7..40c0f7ed36e0 100644
@@ -366,7 +366,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
 	rtc_data->rtc->ops = &stmp3xxx_rtc_ops;
 	rtc_data->rtc->range_max = U32_MAX;
 
-	err = rtc_register_device(rtc_data->rtc);
+	err = devm_rtc_register_device(rtc_data->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-sun4v.c +1 -1
index 036463dfa103..a86e27de8c06 100644
@@ -86,7 +86,7 @@ static int __init sun4v_rtc_probe(struct platform_device *pdev)
 	rtc->range_max = U64_MAX;
 	platform_set_drvdata(pdev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver sun4v_rtc_driver = {
drivers/rtc/rtc-sun6i.c +1 -1
index e2b8b150bcb4..9739f8640f63 100644
@@ -724,7 +724,7 @@ static int sun6i_rtc_probe(struct platform_device *pdev)
 	chip->rtc->ops = &sun6i_rtc_ops;
 	chip->rtc->range_max = 2019686399LL; /* 2033-12-31 23:59:59 */
 
-	ret = rtc_register_device(chip->rtc);
+	ret = devm_rtc_register_device(chip->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-sunxi.c +1 -1
index f5d7f44550ce..5d019e3a835a 100644
@@ -470,7 +470,7 @@ static int sunxi_rtc_probe(struct platform_device *pdev)
 
 	chip->rtc->ops = &sunxi_rtc_ops;
 
-	return rtc_register_device(chip->rtc);
+	return devm_rtc_register_device(chip->rtc);
 }
 
 static struct platform_driver sunxi_rtc_driver = {
drivers/rtc/rtc-tegra.c +1 -1
index 7fbb1741692f..8925015cc698 100644
@@ -329,7 +329,7 @@ static int tegra_rtc_probe(struct platform_device *pdev)
 		goto disable_clk;
 	}
 
-	ret = rtc_register_device(info->rtc);
+	ret = devm_rtc_register_device(info->rtc);
 	if (ret)
 		goto disable_clk;
 
drivers/rtc/rtc-test.c +1 -1
index 74b3a0603b73..b092a1648513 100644
@@ -139,7 +139,7 @@ static int test_probe(struct platform_device *plat_dev)
 	timer_setup(&rtd->alarm, test_rtc_alarm_handler, 0);
 	rtd->alarm.expires = 0;
 
-	return rtc_register_device(rtd->rtc);
+	return devm_rtc_register_device(rtd->rtc);
 }
 
 static struct platform_driver test_driver = {
drivers/rtc/rtc-tps6586x.c +1 -1
index e39af2d67051..a980337c3065 100644
@@ -280,7 +280,7 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
 		goto fail_rtc_register;
 	}
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto fail_rtc_register;
 
drivers/rtc/rtc-tps65910.c +1 -1
index e3840386f430..2d87b62826a8 100644
@@ -434,7 +434,7 @@ static int tps65910_rtc_probe(struct platform_device *pdev)
 	tps_rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	tps_rtc->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(tps_rtc->rtc);
+	return devm_rtc_register_device(tps_rtc->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-tx4939.c +1 -1
index 11f46272bad3..c3309db5448d 100644
@@ -275,7 +275,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static int __exit tx4939_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-vr41xx.c +1 -1
index c3671043ace7..5a9f9ad86d32 100644
@@ -335,7 +335,7 @@ static int rtc_probe(struct platform_device *pdev)
 
 	dev_info(&pdev->dev, "Real Time Clock of NEC VR4100 series\n");
 
-	retval = rtc_register_device(rtc);
+	retval = devm_rtc_register_device(rtc);
 	if (retval)
 		goto err_iounmap_all;
 
drivers/rtc/rtc-vt8500.c +1 -1
index e2588625025f..197b649cd629 100644
@@ -232,7 +232,7 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	return rtc_register_device(vt8500_rtc->rtc);
+	return devm_rtc_register_device(vt8500_rtc->rtc);
 }
 
 static int vt8500_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-wilco-ec.c +1 -1
index ff46066a68a4..2a205a646452 100644
@@ -176,7 +176,7 @@ static int wilco_ec_rtc_probe(struct platform_device *pdev)
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rtc->owner = THIS_MODULE;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver wilco_ec_rtc_driver = {
drivers/rtc/rtc-wm831x.c +1 -1
index ccef887d2690..640833e21057 100644
@@ -429,7 +429,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
 	wm831x_rtc->rtc->ops = &wm831x_rtc_ops;
 	wm831x_rtc->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(wm831x_rtc->rtc);
+	ret = devm_rtc_register_device(wm831x_rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-xgene.c +1 -1
index 96db441f92b3..cf68a9b1c9eb 100644
@@ -185,7 +185,7 @@ static int xgene_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->ops = &xgene_rtc_ops;
 	pdata->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret) {
 		clk_disable_unprepare(pdata->clk);
 		return ret;
drivers/rtc/rtc-zynqmp.c +1 -1
index 4b1077e2f826..f440bb52be92 100644
@@ -264,7 +264,7 @@ static int xlnx_rtc_probe(struct platform_device *pdev)
 
 	device_init_wakeup(&pdev->dev, 1);
 
-	return rtc_register_device(xrtcdev->rtc);
+	return devm_rtc_register_device(xrtcdev->rtc);
 }
 
 static int xlnx_rtc_remove(struct platform_device *pdev)
drivers/rtc/sysfs.c +0 -2
index 950fac0d41ff..8a957d31a1a4 100644
@@ -317,8 +317,6 @@ int rtc_add_groups(struct rtc_device *rtc, const struct attribute_group **grps)
 	size_t old_cnt = 0, add_cnt = 0, new_cnt;
 	const struct attribute_group **groups, **old;
 
-	if (rtc->registered)
-		return -EINVAL;
 	if (!grps)
 		return -EINVAL;
 
include/linux/rtc.h +3 -5
index cbca651d8ca4..55e7beed066c 100644
@@ -118,8 +118,6 @@ struct rtc_device {
 	 */
 	long set_offset_nsec;
 
-	bool registered;
-
 	time64_t range_min;
 	timeu64_t range_max;
 	time64_t start_secs;
@@ -157,7 +155,7 @@ extern struct rtc_device *devm_rtc_device_register(struct device *dev,
 					const struct rtc_class_ops *ops,
 					struct module *owner);
 struct rtc_device *devm_rtc_allocate_device(struct device *dev);
-int __rtc_register_device(struct module *owner, struct rtc_device *rtc);
+int __devm_rtc_register_device(struct module *owner, struct rtc_device *rtc);
 
 extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);
 extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);
@@ -234,8 +232,8 @@ static inline bool rtc_tv_nsec_ok(s64 set_offset_nsec,
 	return false;
 }
 
-#define rtc_register_device(device) \
-	__rtc_register_device(THIS_MODULE, device)
+#define devm_rtc_register_device(device) \
+	__devm_rtc_register_device(THIS_MODULE, device)
 
 #ifdef CONFIG_RTC_HCTOSYS_DEVICE
 extern int rtc_hctosys_ret;
Signature · 1 line
2.29.1
#5 lore raw

PATCH 4/8 rtc: nvmem: remove nvram ABI

In reply to Bartosz Golaszewski

From: Alexandre Belloni <[email protected]>

The nvram sysfs attributes have been deprecated at least since v4.13, more than 3 years ago and nobody ever complained about the deprecation warning.

Remove the sysfs attributes now.

[Bartosz: remove the declaration of rtc_nvmem_unregister()]
---
 drivers/rtc/class.c        |  2 -
 drivers/rtc/nvmem.c        | 82 +-------------------------------------
 drivers/rtc/rtc-cmos.c     |  1 -
 drivers/rtc/rtc-ds1305.c   |  1 -
 drivers/rtc/rtc-ds1307.c   |  1 -
 drivers/rtc/rtc-ds1343.c   |  1 -
 drivers/rtc/rtc-ds1511.c   |  2 -
 drivers/rtc/rtc-ds1553.c   |  1 -
 drivers/rtc/rtc-ds1685.c   |  1 -
 drivers/rtc/rtc-ds1742.c   |  1 -
 drivers/rtc/rtc-m48t59.c   |  1 -
 drivers/rtc/rtc-m48t86.c   |  1 -
 drivers/rtc/rtc-rp5c01.c   |  1 -
 drivers/rtc/rtc-rv8803.c   |  1 -
 drivers/rtc/rtc-stk17ta8.c |  1 -
 drivers/rtc/rtc-tx4939.c   |  1 -
 include/linux/rtc.h        |  6 ---
 17 files changed, 1 insertion(+), 104 deletions(-)
drivers/rtc/class.c +0 -2
index 7c88d190c51f..a99b7d24b77c 100644
@@ -339,8 +339,6 @@ static void devm_rtc_release_device(struct device *dev, void *res)
 {
 	struct rtc_device *rtc = *(struct rtc_device **)res;
 
-	rtc_nvmem_unregister(rtc);
-
 	if (rtc->registered)
 		rtc_device_unregister(rtc);
 	else
drivers/rtc/nvmem.c +1 -81

95 lines not on this page · raw message

drivers/rtc/rtc-cmos.c +0 -1
index c633319cdb91..adca0de76e53 100644
@@ -863,7 +863,6 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 		cmos_rtc.rtc->ops = &cmos_rtc_ops_no_alarm;
 	}
 
-	cmos_rtc.rtc->nvram_old_abi = true;
 	retval = rtc_register_device(cmos_rtc.rtc);
 	if (retval)
 		goto cleanup2;
drivers/rtc/rtc-ds1305.c +0 -1
index a3d790889eea..a1ed539d41b4 100644
@@ -694,7 +694,6 @@ static int ds1305_probe(struct spi_device *spi)
 	ds1305->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
 	ds1305_nvmem_cfg.priv = ds1305;
-	ds1305->rtc->nvram_old_abi = true;
 	status = rtc_register_device(ds1305->rtc);
 	if (status)
 		return status;
drivers/rtc/rtc-ds1307.c +0 -1
index 9f5f54ca039d..2e6063807bd4 100644
@@ -2047,7 +2047,6 @@ static int ds1307_probe(struct i2c_client *client,
 			.priv = ds1307,
 		};
 
-		ds1307->rtc->nvram_old_abi = true;
 		rtc_nvmem_register(ds1307->rtc, &nvmem_cfg);
 	}
 
drivers/rtc/rtc-ds1343.c +0 -1
index ba143423875b..e7604e844cbd 100644
@@ -399,7 +399,6 @@ static int ds1343_probe(struct spi_device *spi)
 	if (IS_ERR(priv->rtc))
 		return PTR_ERR(priv->rtc);
 
-	priv->rtc->nvram_old_abi = true;
 	priv->rtc->ops = &ds1343_rtc_ops;
 	priv->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	priv->rtc->range_max = RTC_TIMESTAMP_END_2099;
drivers/rtc/rtc-ds1511.c +0 -2
index a63872c4c76d..33c483d759c8 100644
@@ -466,8 +466,6 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
 
 	pdata->rtc->ops = &ds1511_rtc_ops;
 
-	pdata->rtc->nvram_old_abi = true;
-
 	ret = rtc_register_device(pdata->rtc);
 	if (ret)
 		return ret;
drivers/rtc/rtc-ds1553.c +0 -1
index cdf5e05b9489..c6a5563504e5 100644
@@ -294,7 +294,6 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(pdata->rtc);
 
 	pdata->rtc->ops = &ds1553_rtc_ops;
-	pdata->rtc->nvram_old_abi = true;
 
 	ret = rtc_register_device(pdata->rtc);
 	if (ret)
drivers/rtc/rtc-ds1685.c +0 -1
index dfbd7b88b2b9..9043c96e8845 100644
@@ -1316,7 +1316,6 @@ ds1685_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	rtc_dev->nvram_old_abi = true;
 	nvmem_cfg.priv = rtc;
 	ret = rtc_nvmem_register(rtc_dev, &nvmem_cfg);
 	if (ret)
drivers/rtc/rtc-ds1742.c +0 -1
index 2b949f0dbaa9..291bbed90ef8 100644
@@ -190,7 +190,6 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(rtc);
 
 	rtc->ops = &ds1742_rtc_ops;
-	rtc->nvram_old_abi = true;
 
 	ret = rtc_register_device(rtc);
 	if (ret)
drivers/rtc/rtc-m48t59.c +0 -1
index 67e218758a8b..ee1d8f0146fd 100644
@@ -463,7 +463,6 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
 	if (IS_ERR(m48t59->rtc))
 		return PTR_ERR(m48t59->rtc);
 
-	m48t59->rtc->nvram_old_abi = true;
 	m48t59->rtc->ops = ops;
 
 	nvmem_cfg.size = pdata->offset;
drivers/rtc/rtc-m48t86.c +0 -1
index 75a0e73071d8..2b1135590dd5 100644
@@ -254,7 +254,6 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(info->rtc);
 
 	info->rtc->ops = &m48t86_rtc_ops;
-	info->rtc->nvram_old_abi = true;
 
 	err = rtc_register_device(info->rtc);
 	if (err)
drivers/rtc/rtc-rp5c01.c +0 -1
index 8776eadbdd3a..a69e8adcc4a1 100644
@@ -251,7 +251,6 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 		return PTR_ERR(rtc);
 
 	rtc->ops = &rp5c01_rtc_ops;
-	rtc->nvram_old_abi = true;
 
 	priv->rtc = rtc;
 
drivers/rtc/rtc-rv8803.c +0 -1
index c6d8e3425688..1d888da48c7c 100644
@@ -585,7 +585,6 @@ static int rv8803_probe(struct i2c_client *client,
 	}
 
 	rv8803->rtc->ops = &rv8803_rtc_ops;
-	rv8803->rtc->nvram_old_abi = true;
 	rv8803->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv8803->rtc->range_max = RTC_TIMESTAMP_END_2099;
 	err = rtc_register_device(rv8803->rtc);
drivers/rtc/rtc-stk17ta8.c +0 -1
index 01a45044f468..1ccf0d5d05b4 100644
@@ -311,7 +311,6 @@ static int stk17ta8_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(pdata->rtc);
 
 	pdata->rtc->ops = &stk17ta8_rtc_ops;
-	pdata->rtc->nvram_old_abi = true;
 
 	nvmem_cfg.priv = pdata;
 	ret = rtc_nvmem_register(pdata->rtc, &nvmem_cfg);
drivers/rtc/rtc-tx4939.c +0 -1
index 715b82981279..abbb62b14d7a 100644
@@ -266,7 +266,6 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 		return PTR_ERR(rtc);
 
 	rtc->ops = &tx4939_rtc_ops;
-	rtc->nvram_old_abi = true;
 	rtc->range_max = U32_MAX;
 
 	pdata->rtc = rtc;
include/linux/rtc.h +0 -6
index 22d1575e4991..0983ab9faffb 100644
@@ -120,10 +120,6 @@ struct rtc_device {
 
 	bool registered;
 
-	/* Old ABI support */
-	bool nvram_old_abi;
-	struct bin_attribute *nvram;
-
 	time64_t range_min;
 	timeu64_t range_max;
 	time64_t start_secs;
@@ -250,14 +246,12 @@ extern int rtc_hctosys_ret;
 #ifdef CONFIG_RTC_NVMEM
 int rtc_nvmem_register(struct rtc_device *rtc,
 		       struct nvmem_config *nvmem_config);
-void rtc_nvmem_unregister(struct rtc_device *rtc);
 #else
 static inline int rtc_nvmem_register(struct rtc_device *rtc,
 				     struct nvmem_config *nvmem_config)
 {
 	return 0;
 }
-static inline void rtc_nvmem_unregister(struct rtc_device *rtc) {}
 #endif
 
 #ifdef CONFIG_RTC_INTF_SYSFS
Signature · 1 line
2.29.1
#3 lore raw

Re: [PATCH 2/8] Revert "rtc: sc27xx: Always read normal alarm when registering RTC device"

In reply to Bartosz Golaszewski
Quoted 7 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

This reverts commit 3822d1bb0df18aa28930f19bc46e0704aea1be0f.

The registered field in struct rtc_device is not supposed to be used by drivers and is going to be removed soon. In this function it will be always 0 so the check is useless anyway.

This is actually the opposite, rtc->rtc->registered being always 0 means that the auxiliary alarm will never be read. I've sent the proper patch.

Quoted 30 lines
---
 drivers/rtc/rtc-sc27xx.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/rtc/rtc-sc27xx.c +2 -6
index 36810dd40cd3..8e3d6be990c5 100644
@@ -415,14 +415,10 @@ static int sprd_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 	u32 val;
 
 	/*
-	 * Before RTC device is registered, it will check to see if there is an
-	 * alarm already set in RTC hardware, and we always read the normal
-	 * alarm at this time.
-	 *
-	 * Or if aie_timer is enabled, we should get the normal alarm time.
+	 * If aie_timer is enabled, we should get the normal alarm time.
 	 * Otherwise we should get auxiliary alarm time.
 	 */
-	if (rtc->rtc && rtc->rtc->registered && rtc->rtc->aie_timer.enabled == 0)
+	if (rtc->rtc && rtc->rtc->aie_timer.enabled == 0)
 		return sprd_rtc_read_aux_alarm(dev, alrm);
 
 	ret = sprd_rtc_get_secs(rtc, SPRD_RTC_ALARM, &secs);
Signature · 1 line
2.29.1
Signature · 3 lines
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#9 lore raw

Re: [PATCH 7/8] rtc: rework rtc_register_device() resource management

In reply to Bartosz Golaszewski
Quoted 11 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

rtc_register_device() is a managed interface but it doesn't use devres by itself - instead it marks an rtc_device as "registered" and the devres callback for devm_rtc_allocate_device() takes care of resource release.

This doesn't correspond with the design behind devres where managed structures should not be aware of being managed. The correct solution here is to register a separate devres callback for unregistering the device.

Quoted 5 lines

While at it: rename rtc_register_device() to devm_rtc_register_device() and add it to the list of managed interfaces in devres.rst. This way we can avoid any potential confusion of driver developers who may expect there to exist a corresponding unregister function.

I'm going to apply that but honestly, I don't like the fact that we now end up with both devm_rtc_device_register and devm_rtc_register_device. This was the main reason to not have the devm_ prefix there. I find that way more confusing than the current situation.

Quoted 1,675 lines
---
 .../driver-api/driver-model/devres.rst        |  1 +
 arch/alpha/kernel/rtc.c                       |  2 +-
 drivers/mfd/menelaus.c                        |  2 +-
 drivers/rtc/class.c                           | 19 +++++++++----------
 drivers/rtc/rtc-88pm80x.c                     |  2 +-
 drivers/rtc/rtc-88pm860x.c                    |  2 +-
 drivers/rtc/rtc-ab-b5ze-s3.c                  |  2 +-
 drivers/rtc/rtc-ab-eoz9.c                     |  2 +-
 drivers/rtc/rtc-ab3100.c                      |  2 +-
 drivers/rtc/rtc-ab8500.c                      |  2 +-
 drivers/rtc/rtc-abx80x.c                      |  2 +-
 drivers/rtc/rtc-ac100.c                       |  2 +-
 drivers/rtc/rtc-armada38x.c                   |  2 +-
 drivers/rtc/rtc-aspeed.c                      |  2 +-
 drivers/rtc/rtc-at91rm9200.c                  |  2 +-
 drivers/rtc/rtc-at91sam9.c                    |  2 +-
 drivers/rtc/rtc-au1xxx.c                      |  2 +-
 drivers/rtc/rtc-bd70528.c                     |  2 +-
 drivers/rtc/rtc-brcmstb-waketimer.c           |  2 +-
 drivers/rtc/rtc-cadence.c                     |  2 +-
 drivers/rtc/rtc-cmos.c                        |  2 +-
 drivers/rtc/rtc-coh901331.c                   |  2 +-
 drivers/rtc/rtc-cpcap.c                       |  2 +-
 drivers/rtc/rtc-cros-ec.c                     |  2 +-
 drivers/rtc/rtc-da9052.c                      |  2 +-
 drivers/rtc/rtc-da9063.c                      |  2 +-
 drivers/rtc/rtc-davinci.c                     |  2 +-
 drivers/rtc/rtc-digicolor.c                   |  2 +-
 drivers/rtc/rtc-dm355evm.c                    |  2 +-
 drivers/rtc/rtc-ds1305.c                      |  2 +-
 drivers/rtc/rtc-ds1307.c                      |  2 +-
 drivers/rtc/rtc-ds1343.c                      |  2 +-
 drivers/rtc/rtc-ds1347.c                      |  2 +-
 drivers/rtc/rtc-ds1374.c                      |  2 +-
 drivers/rtc/rtc-ds1511.c                      |  2 +-
 drivers/rtc/rtc-ds1553.c                      |  2 +-
 drivers/rtc/rtc-ds1672.c                      |  2 +-
 drivers/rtc/rtc-ds1685.c                      |  2 +-
 drivers/rtc/rtc-ds1742.c                      |  2 +-
 drivers/rtc/rtc-ds2404.c                      |  2 +-
 drivers/rtc/rtc-ep93xx.c                      |  2 +-
 drivers/rtc/rtc-fsl-ftm-alarm.c               |  2 +-
 drivers/rtc/rtc-ftrtc010.c                    |  2 +-
 drivers/rtc/rtc-goldfish.c                    |  2 +-
 drivers/rtc/rtc-imx-sc.c                      |  2 +-
 drivers/rtc/rtc-imxdi.c                       |  2 +-
 drivers/rtc/rtc-isl12026.c                    |  2 +-
 drivers/rtc/rtc-isl1208.c                     |  2 +-
 drivers/rtc/rtc-jz4740.c                      |  2 +-
 drivers/rtc/rtc-lpc32xx.c                     |  2 +-
 drivers/rtc/rtc-ls1x.c                        |  2 +-
 drivers/rtc/rtc-m41t80.c                      |  2 +-
 drivers/rtc/rtc-m48t59.c                      |  2 +-
 drivers/rtc/rtc-m48t86.c                      |  2 +-
 drivers/rtc/rtc-mc13xxx.c                     |  2 +-
 drivers/rtc/rtc-meson-vrtc.c                  |  2 +-
 drivers/rtc/rtc-meson.c                       |  2 +-
 drivers/rtc/rtc-mpc5121.c                     |  2 +-
 drivers/rtc/rtc-mrst.c                        |  2 +-
 drivers/rtc/rtc-mt2712.c                      |  2 +-
 drivers/rtc/rtc-mt6397.c                      |  2 +-
 drivers/rtc/rtc-mv.c                          |  2 +-
 drivers/rtc/rtc-mxc.c                         |  2 +-
 drivers/rtc/rtc-mxc_v2.c                      |  2 +-
 drivers/rtc/rtc-omap.c                        |  2 +-
 drivers/rtc/rtc-pcap.c                        |  2 +-
 drivers/rtc/rtc-pcf2123.c                     |  2 +-
 drivers/rtc/rtc-pcf2127.c                     |  2 +-
 drivers/rtc/rtc-pcf85063.c                    |  2 +-
 drivers/rtc/rtc-pcf85363.c                    |  2 +-
 drivers/rtc/rtc-pcf8563.c                     |  2 +-
 drivers/rtc/rtc-pic32.c                       |  2 +-
 drivers/rtc/rtc-pl030.c                       |  2 +-
 drivers/rtc/rtc-pl031.c                       |  2 +-
 drivers/rtc/rtc-pm8xxx.c                      |  2 +-
 drivers/rtc/rtc-ps3.c                         |  2 +-
 drivers/rtc/rtc-r9701.c                       |  2 +-
 drivers/rtc/rtc-rc5t619.c                     |  2 +-
 drivers/rtc/rtc-rk808.c                       |  2 +-
 drivers/rtc/rtc-rp5c01.c                      |  2 +-
 drivers/rtc/rtc-rs5c348.c                     |  2 +-
 drivers/rtc/rtc-rv3028.c                      |  2 +-
 drivers/rtc/rtc-rv3029c2.c                    |  2 +-
 drivers/rtc/rtc-rv3032.c                      |  2 +-
 drivers/rtc/rtc-rv8803.c                      |  2 +-
 drivers/rtc/rtc-rx8010.c                      |  2 +-
 drivers/rtc/rtc-rx8581.c                      |  2 +-
 drivers/rtc/rtc-s35390a.c                     |  2 +-
 drivers/rtc/rtc-sa1100.c                      |  2 +-
 drivers/rtc/rtc-sc27xx.c                      |  2 +-
 drivers/rtc/rtc-sd3078.c                      |  2 +-
 drivers/rtc/rtc-sh.c                          |  2 +-
 drivers/rtc/rtc-sirfsoc.c                     |  2 +-
 drivers/rtc/rtc-snvs.c                        |  2 +-
 drivers/rtc/rtc-st-lpc.c                      |  2 +-
 drivers/rtc/rtc-starfire.c                    |  2 +-
 drivers/rtc/rtc-stk17ta8.c                    |  2 +-
 drivers/rtc/rtc-stmp3xxx.c                    |  2 +-
 drivers/rtc/rtc-sun4v.c                       |  2 +-
 drivers/rtc/rtc-sun6i.c                       |  2 +-
 drivers/rtc/rtc-sunxi.c                       |  2 +-
 drivers/rtc/rtc-tegra.c                       |  2 +-
 drivers/rtc/rtc-test.c                        |  2 +-
 drivers/rtc/rtc-tps6586x.c                    |  2 +-
 drivers/rtc/rtc-tps65910.c                    |  2 +-
 drivers/rtc/rtc-tx4939.c                      |  2 +-
 drivers/rtc/rtc-vr41xx.c                      |  2 +-
 drivers/rtc/rtc-vt8500.c                      |  2 +-
 drivers/rtc/rtc-wilco-ec.c                    |  2 +-
 drivers/rtc/rtc-wm831x.c                      |  2 +-
 drivers/rtc/rtc-xgene.c                       |  2 +-
 drivers/rtc/rtc-zynqmp.c                      |  2 +-
 drivers/rtc/sysfs.c                           |  2 --
 include/linux/rtc.h                           |  8 +++-----
 114 files changed, 123 insertions(+), 127 deletions(-)
Documentation/driver-api/driver-model/devres.rst +1 -0
index 5df7ba54a4ba..cd8b6e657b94 100644
@@ -414,6 +414,7 @@ RESET
 RTC
   devm_rtc_device_register()
   devm_rtc_allocate_device()
+  devm_rtc_register_device()
   devm_rtc_nvmem_register()
 
 SERDEV
arch/alpha/kernel/rtc.c +1 -1
index 1b1d5963ac55..ce3077946e1d 100644
@@ -216,6 +216,6 @@ alpha_rtc_init(void)
 		rtc->ops = &remote_rtc_ops;
 #endif
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 device_initcall(alpha_rtc_init);
drivers/mfd/menelaus.c +1 -1
index b64d3315a5e1..07e0ca2e467c 100644
@@ -1119,7 +1119,7 @@ static inline void menelaus_rtc_init(struct menelaus_chip *m)
 		menelaus_write_reg(MENELAUS_RTC_CTRL, m->rtc_control);
 	}
 
-	err = rtc_register_device(m->rtc);
+	err = devm_rtc_register_device(m->rtc);
 	if (err) {
 		if (alarm) {
 			menelaus_remove_irq_work(MENELAUS_RTCALM_IRQ);
drivers/rtc/class.c +9 -10
index a99b7d24b77c..b8a34ee039ad 100644
@@ -321,8 +321,10 @@ static void rtc_device_get_offset(struct rtc_device *rtc)
  *
  * @rtc: the RTC class device to destroy
  */
-static void rtc_device_unregister(struct rtc_device *rtc)
+static void devm_rtc_unregister_device(void *data)
 {
+	struct rtc_device *rtc = data;
+
 	mutex_lock(&rtc->ops_lock);
 	/*
 	 * Remove innards of this RTC, then disable it, before
@@ -339,10 +341,7 @@ static void devm_rtc_release_device(struct device *dev, void *res)
 {
 	struct rtc_device *rtc = *(struct rtc_device **)res;
 
-	if (rtc->registered)
-		rtc_device_unregister(rtc);
-	else
-		put_device(&rtc->dev);
+	put_device(&rtc->dev);
 }
 
 struct rtc_device *devm_rtc_allocate_device(struct device *dev)
@@ -383,7 +382,7 @@ struct rtc_device *devm_rtc_allocate_device(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(devm_rtc_allocate_device);
 
-int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
+int __devm_rtc_register_device(struct module *owner, struct rtc_device *rtc)
 {
 	struct rtc_wkalrm alrm;
 	int err;
@@ -413,7 +412,6 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
 
 	rtc_proc_add_device(rtc);
 
-	rtc->registered = true;
 	dev_info(rtc->dev.parent, "registered as %s\n",
 		 dev_name(&rtc->dev));
 
@@ -422,9 +420,10 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc)
 		rtc_hctosys(rtc);
 #endif
 
-	return 0;
+	return devm_add_action_or_reset(rtc->dev.parent,
+					devm_rtc_unregister_device, rtc);
 }
-EXPORT_SYMBOL_GPL(__rtc_register_device);
+EXPORT_SYMBOL_GPL(__devm_rtc_register_device);
 
 /**
  * devm_rtc_device_register - resource managed rtc_device_register()
@@ -454,7 +453,7 @@ struct rtc_device *devm_rtc_device_register(struct device *dev,
 
 	rtc->ops = ops;
 
-	err = __rtc_register_device(owner, rtc);
+	err = __devm_rtc_register_device(owner, rtc);
 	if (err)
 		return ERR_PTR(err);
 
drivers/rtc/rtc-88pm80x.c +1 -1
index 75779e8501a3..6a3f44cf6ebe 100644
@@ -294,7 +294,7 @@ static int pm80x_rtc_probe(struct platform_device *pdev)
 	info->rtc_dev->ops = &pm80x_rtc_ops;
 	info->rtc_dev->range_max = U32_MAX;
 
-	ret = rtc_register_device(info->rtc_dev);
+	ret = devm_rtc_register_device(info->rtc_dev);
 	if (ret)
 		goto out_rtc;
 
drivers/rtc/rtc-88pm860x.c +1 -1
index c90457d001e9..2c809a1a445e 100644
@@ -307,7 +307,7 @@ static int pm860x_rtc_probe(struct platform_device *pdev)
 	info->rtc_dev->ops = &pm860x_rtc_ops;
 	info->rtc_dev->range_max = U32_MAX;
 
-	ret = rtc_register_device(info->rtc_dev);
+	ret = devm_rtc_register_device(info->rtc_dev);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ab-b5ze-s3.c +1 -1
index 2370ac0cdb5f..6e3e320dc727 100644
@@ -892,7 +892,7 @@ static int abb5zes3_probe(struct i2c_client *client,
 		}
 	}
 
-	ret = rtc_register_device(data->rtc);
+	ret = devm_rtc_register_device(data->rtc);
 
 err:
 	if (ret && data->irq)
drivers/rtc/rtc-ab-eoz9.c +1 -1
index d690985caa4c..b20d8f26dcdb 100644
@@ -420,7 +420,7 @@ static int abeoz9_probe(struct i2c_client *client,
 	data->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	data->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(data->rtc);
+	ret = devm_rtc_register_device(data->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ab3100.c +1 -1
index 2ed6def90975..e4fd961e8bf6 100644
@@ -238,7 +238,7 @@ static int __init ab3100_rtc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver ab3100_rtc_driver = {
drivers/rtc/rtc-ab8500.c +1 -1
index 3d60f3283f11..b40048871295 100644
@@ -404,7 +404,7 @@ static int ab8500_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static int ab8500_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-abx80x.c +1 -1
index 803725b3a02c..6733bb0df674 100644
@@ -851,7 +851,7 @@ static int abx80x_probe(struct i2c_client *client,
 		return err;
 	}
 
-	return rtc_register_device(priv->rtc);
+	return devm_rtc_register_device(priv->rtc);
 }
 
 static const struct i2c_device_id abx80x_id[] = {
drivers/rtc/rtc-ac100.c +1 -1
index 29223931aba7..1ddbef99e38f 100644
@@ -610,7 +610,7 @@ static int ac100_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(chip->rtc);
+	return devm_rtc_register_device(chip->rtc);
 }
 
 static int ac100_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-armada38x.c +1 -1
index 94d7c22fc4f3..807a79c07f08 100644
@@ -556,7 +556,7 @@ static __init int armada38x_rtc_probe(struct platform_device *pdev)
 
 	rtc->rtc_dev->range_max = U32_MAX;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-aspeed.c +1 -1
index eacdd0637cce..a93352ed3aec 100644
@@ -104,7 +104,7 @@ static int aspeed_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->range_min = RTC_TIMESTAMP_BEGIN_1900;
 	rtc->rtc_dev->range_max = 38814989399LL; /* 3199-12-31 23:59:59 */
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id aspeed_rtc_match[] = {
drivers/rtc/rtc-at91rm9200.c +1 -1
index 5e811e04cb21..ba49cc095aef 100644
@@ -440,7 +440,7 @@ static int __init at91_rtc_probe(struct platform_device *pdev)
 	rtc->ops = &at91_rtc_ops;
 	rtc->range_min = RTC_TIMESTAMP_BEGIN_1900;
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 	if (ret)
 		goto err_clk;
 
drivers/rtc/rtc-at91sam9.c +1 -1
index e39e89867d29..2216be429ab7 100644
@@ -431,7 +431,7 @@ static int at91_rtc_probe(struct platform_device *pdev)
 		dev_warn(&pdev->dev, "%s: SET TIME!\n",
 			 dev_name(&rtc->rtcdev->dev));
 
-	return rtc_register_device(rtc->rtcdev);
+	return devm_rtc_register_device(rtc->rtcdev);
 
 err_clk:
 	clk_disable_unprepare(rtc->sclk);
drivers/rtc/rtc-au1xxx.c +1 -1
index 791bebcb6f47..e6428b27b5d4 100644
@@ -104,7 +104,7 @@ static int au1xtoy_rtc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtcdev);
 
-	return rtc_register_device(rtcdev);
+	return devm_rtc_register_device(rtcdev);
 }
 
 static struct platform_driver au1xrtc_driver = {
drivers/rtc/rtc-bd70528.c +1 -1
index 4492b770422c..17cb67f5bf6e 100644
@@ -604,7 +604,7 @@ static int bd70528_probe(struct platform_device *pdev)
 		}
 	}
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static const struct platform_device_id bd718x7_rtc_id[] = {
drivers/rtc/rtc-brcmstb-waketimer.c +1 -1
index 4fee57c51280..560465b57419 100644
@@ -252,7 +252,7 @@ static int brcmstb_waketmr_probe(struct platform_device *pdev)
 	timer->rtc->ops = &brcmstb_waketmr_ops;
 	timer->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(timer->rtc);
+	ret = devm_rtc_register_device(timer->rtc);
 	if (ret)
 		goto err_notifier;
 
drivers/rtc/rtc-cadence.c +1 -1
index 595d5d252850..1edf7f16d73a 100644
@@ -336,7 +336,7 @@ static int cdns_rtc_probe(struct platform_device *pdev)
 	writel(0, crtc->regs + CDNS_RTC_HMR);
 	writel(CDNS_RTC_KRTCR_KRTC, crtc->regs + CDNS_RTC_KRTCR);
 
-	ret = rtc_register_device(crtc->rtc_dev);
+	ret = devm_rtc_register_device(crtc->rtc_dev);
 	if (ret)
 		goto err_disable_wakeup;
 
drivers/rtc/rtc-cmos.c +1 -1
index 766074c04b53..83415600185c 100644
@@ -863,7 +863,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
 		cmos_rtc.rtc->ops = &cmos_rtc_ops_no_alarm;
 	}
 
-	retval = rtc_register_device(cmos_rtc.rtc);
+	retval = devm_rtc_register_device(cmos_rtc.rtc);
 	if (retval)
 		goto cleanup2;
 
drivers/rtc/rtc-coh901331.c +1 -1
index da59917c9ee8..168ced87d93a 100644
@@ -203,7 +203,7 @@ static int __init coh901331_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtap);
 
-	ret = rtc_register_device(rtap->rtc);
+	ret = devm_rtc_register_device(rtap->rtc);
 	if (ret)
 		goto out_no_rtc;
 
drivers/rtc/rtc-cpcap.c +1 -1
index 800667d73a6f..8f8369507103 100644
@@ -299,7 +299,7 @@ static int cpcap_rtc_probe(struct platform_device *pdev)
 		/* ignore error and continue without wakeup support */
 	}
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id cpcap_rtc_of_match[] = {
drivers/rtc/rtc-cros-ec.c +1 -1
index f7343c289cab..70626793ca69 100644
@@ -350,7 +350,7 @@ static int cros_ec_rtc_probe(struct platform_device *pdev)
 	cros_ec_rtc->rtc->ops = &cros_ec_rtc_ops;
 	cros_ec_rtc->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(cros_ec_rtc->rtc);
+	ret = devm_rtc_register_device(cros_ec_rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-da9052.c +1 -1
index 58de10da37b1..9ca99bd35702 100644
@@ -304,7 +304,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
 	rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rtc->rtc->range_max = RTC_TIMESTAMP_END_2063;
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-da9063.c +1 -1
index 046b1d4c3dae..03a55a3e2433 100644
@@ -494,7 +494,7 @@ static int da9063_rtc_probe(struct platform_device *pdev)
 		dev_err(&pdev->dev, "Failed to request ALARM IRQ %d: %d\n",
 			irq_alarm, ret);
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static struct platform_driver da9063_rtc_driver = {
drivers/rtc/rtc-davinci.c +1 -1
index 73f87a17cdf3..6bef0f2353da 100644
@@ -484,7 +484,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
 
 	device_init_wakeup(&pdev->dev, 0);
 
-	return rtc_register_device(davinci_rtc->rtc);
+	return devm_rtc_register_device(davinci_rtc->rtc);
 }
 
 static int __exit davinci_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-digicolor.c +1 -1
index 200d85b01e8b..4fdfa5b6feb2 100644
@@ -202,7 +202,7 @@ static int __init dc_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->ops = &dc_rtc_ops;
 	rtc->rtc_dev->range_max = U32_MAX;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static const struct of_device_id dc_dt_ids[] = {
drivers/rtc/rtc-dm355evm.c +1 -1
index cd947a20843b..94fb16ac3e0f 100644
@@ -132,7 +132,7 @@ static int dm355evm_rtc_probe(struct platform_device *pdev)
 	rtc->ops = &dm355evm_rtc_ops;
 	rtc->range_max = U32_MAX;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 /*
drivers/rtc/rtc-ds1305.c +1 -1
index a4e768261b43..8c2ab29c3d91 100644
@@ -694,7 +694,7 @@ static int ds1305_probe(struct spi_device *spi)
 	ds1305->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
 	ds1305_nvmem_cfg.priv = ds1305;
-	status = rtc_register_device(ds1305->rtc);
+	status = devm_rtc_register_device(ds1305->rtc);
 	if (status)
 		return status;
 
drivers/rtc/rtc-ds1307.c +1 -1
index 1dc377e0b225..97b086441b17 100644
@@ -2032,7 +2032,7 @@ static int ds1307_probe(struct i2c_client *client,
 	if (err)
 		return err;
 
-	err = rtc_register_device(ds1307->rtc);
+	err = devm_rtc_register_device(ds1307->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-ds1343.c +1 -1
index ea663e24a34c..f14ed6c96437 100644
@@ -408,7 +408,7 @@ static int ds1343_probe(struct spi_device *spi)
 		dev_err(&spi->dev,
 			"unable to create sysfs entries for rtc ds1343\n");
 
-	res = rtc_register_device(priv->rtc);
+	res = devm_rtc_register_device(priv->rtc);
 	if (res)
 		return res;
 
drivers/rtc/rtc-ds1347.c +1 -1
index 7025cf3fb9f8..157bf5209ac4 100644
@@ -166,7 +166,7 @@ static int ds1347_probe(struct spi_device *spi)
 	rtc->range_min = RTC_TIMESTAMP_BEGIN_0000;
 	rtc->range_max = RTC_TIMESTAMP_END_9999;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct spi_driver ds1347_driver = {
drivers/rtc/rtc-ds1374.c +1 -1
index 177d870bda0d..fab79921a712 100644
@@ -508,7 +508,7 @@ static int ds1374_probe(struct i2c_client *client,
 	ds1374->rtc->ops = &ds1374_rtc_ops;
 	ds1374->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(ds1374->rtc);
+	ret = devm_rtc_register_device(ds1374->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1511.c +1 -1
index d5f48216e851..bda884333082 100644
@@ -466,7 +466,7 @@ static int ds1511_rtc_probe(struct platform_device *pdev)
 
 	pdata->rtc->ops = &ds1511_rtc_ops;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1553.c +1 -1
index bb40ea8b6373..dbff5b621ef5 100644
@@ -295,7 +295,7 @@ static int ds1553_rtc_probe(struct platform_device *pdev)
 
 	pdata->rtc->ops = &ds1553_rtc_ops;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds1672.c +1 -1
index 9da84df9f152..630493759d15 100644
@@ -124,7 +124,7 @@ static int ds1672_probe(struct i2c_client *client,
 	rtc->ops = &ds1672_rtc_ops;
 	rtc->range_max = U32_MAX;
 
-	err = rtc_register_device(rtc);
+	err = devm_rtc_register_device(rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-ds1685.c +1 -1
index bef588fce266..d69c807af29b 100644
@@ -1321,7 +1321,7 @@ ds1685_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(rtc_dev);
+	return devm_rtc_register_device(rtc_dev);
 }
 
 /**
drivers/rtc/rtc-ds1742.c +1 -1
index 39c6c3a85b34..13d45c697da6 100644
@@ -191,7 +191,7 @@ static int ds1742_rtc_probe(struct platform_device *pdev)
 
 	rtc->ops = &ds1742_rtc_ops;
 
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-ds2404.c +1 -1
index 9df0c44512b8..0480f592307e 100644
@@ -234,7 +234,7 @@ static int rtc_probe(struct platform_device *pdev)
 	chip->rtc->ops = &ds2404_rtc_ops;
 	chip->rtc->range_max = U32_MAX;
 
-	retval = rtc_register_device(chip->rtc);
+	retval = devm_rtc_register_device(chip->rtc);
 	if (retval)
 		return retval;
 
drivers/rtc/rtc-ep93xx.c +1 -1
index 8ec9ea1ca72e..9a5a15cbcd9b 100644
@@ -145,7 +145,7 @@ static int ep93xx_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(ep93xx_rtc->rtc);
+	return devm_rtc_register_device(ep93xx_rtc->rtc);
 }
 
 static struct platform_driver ep93xx_rtc_driver = {
drivers/rtc/rtc-fsl-ftm-alarm.c +1 -1
index 48d3b38ea348..57cc09d0a806 100644
@@ -290,7 +290,7 @@ static int ftm_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		dev_err(&pdev->dev, "failed to enable irq wake\n");
 
-	ret = rtc_register_device(rtc->rtc_dev);
+	ret = devm_rtc_register_device(rtc->rtc_dev);
 	if (ret) {
 		dev_err(&pdev->dev, "can't register rtc device\n");
 		return ret;
drivers/rtc/rtc-ftrtc010.c +1 -1
index 0919f7dc94a3..ad3add5db4c8 100644
@@ -176,7 +176,7 @@ static int ftrtc010_rtc_probe(struct platform_device *pdev)
 	if (unlikely(ret))
 		return ret;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 static int ftrtc010_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-goldfish.c +1 -1
index 6349d2cd3680..7ab95d052644 100644
@@ -194,7 +194,7 @@ static int goldfish_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(rtcdrv->rtc);
+	return devm_rtc_register_device(rtcdrv->rtc);
 }
 
 static const struct of_device_id goldfish_rtc_of_match[] = {
drivers/rtc/rtc-imx-sc.c +1 -1
index a5f59e6f862e..cc9fbab49999 100644
@@ -166,7 +166,7 @@ static int imx_sc_rtc_probe(struct platform_device *pdev)
 	imx_sc_rtc->range_min = 0;
 	imx_sc_rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(imx_sc_rtc);
+	ret = devm_rtc_register_device(imx_sc_rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-imxdi.c +1 -1
index 8d141d8a5490..c2692da74e09 100644
@@ -814,7 +814,7 @@ static int __init dryice_rtc_probe(struct platform_device *pdev)
 	imxdi->rtc->ops = &dryice_rtc_ops;
 	imxdi->rtc->range_max = U32_MAX;
 
-	rc = rtc_register_device(imxdi->rtc);
+	rc = devm_rtc_register_device(imxdi->rtc);
 	if (rc)
 		goto err;
 
drivers/rtc/rtc-isl12026.c +1 -1
index fff8d8253669..1fc6627d854d 100644
@@ -469,7 +469,7 @@ static int isl12026_probe_new(struct i2c_client *client)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(priv->rtc);
+	return devm_rtc_register_device(priv->rtc);
 }
 
 static int isl12026_remove(struct i2c_client *client)
drivers/rtc/rtc-isl1208.c +1 -1
index 08d778b10e9e..563a6d9c9fcf 100644
@@ -894,7 +894,7 @@ isl1208_probe(struct i2c_client *client, const struct i2c_device_id *id)
 	if (rc)
 		return rc;
 
-	return rtc_register_device(isl1208->rtc);
+	return devm_rtc_register_device(isl1208->rtc);
 }
 
 static struct i2c_driver isl1208_driver = {
drivers/rtc/rtc-jz4740.c +1 -1
index 9607e6b6e0b3..6e51df72fd65 100644
@@ -375,7 +375,7 @@ static int jz4740_rtc_probe(struct platform_device *pdev)
 	/* Each 1 Hz pulse should happen after (rate) ticks */
 	jz4740_rtc_reg_write(rtc, JZ_REG_RTC_REGULATOR, rate - 1);
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-lpc32xx.c +1 -1
index 15d8abda81fe..76ad7031a13d 100644
@@ -239,7 +239,7 @@ static int lpc32xx_rtc_probe(struct platform_device *pdev)
 	rtc->rtc->ops = &lpc32xx_rtc_ops;
 	rtc->rtc->range_max = U32_MAX;
 
-	err = rtc_register_device(rtc->rtc);
+	err = devm_rtc_register_device(rtc->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-ls1x.c +1 -1
index 8bd34056fea0..5af26dc5c2a3 100644
@@ -176,7 +176,7 @@ static int ls1x_rtc_probe(struct platform_device *pdev)
 	rtcdev->range_min = RTC_TIMESTAMP_BEGIN_1900;
 	rtcdev->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(rtcdev);
+	return devm_rtc_register_device(rtcdev);
 }
 
 static struct platform_driver  ls1x_rtc_driver = {
drivers/rtc/rtc-m41t80.c +1 -1
index 8a89bc52b0d4..160dcf68e64e 100644
@@ -977,7 +977,7 @@ static int m41t80_probe(struct i2c_client *client,
 		m41t80_sqw_register_clk(m41t80_data);
 #endif
 
-	rc = rtc_register_device(m41t80_data->rtc);
+	rc = devm_rtc_register_device(m41t80_data->rtc);
 	if (rc)
 		return rc;
 
drivers/rtc/rtc-m48t59.c +1 -1
index e966a66ab2d3..5f5898d3b055 100644
@@ -470,7 +470,7 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	ret = rtc_register_device(m48t59->rtc);
+	ret = devm_rtc_register_device(m48t59->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-m48t86.c +1 -1
index 182cfe59e4e0..481c9525b1dd 100644
@@ -255,7 +255,7 @@ static int m48t86_rtc_probe(struct platform_device *pdev)
 
 	info->rtc->ops = &m48t86_rtc_ops;
 
-	err = rtc_register_device(info->rtc);
+	err = devm_rtc_register_device(info->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-mc13xxx.c +1 -1
index d6802e6191cb..d4234e78497e 100644
@@ -307,7 +307,7 @@ static int __init mc13xxx_rtc_probe(struct platform_device *pdev)
 
 	mc13xxx_unlock(mc13xxx);
 
-	ret = rtc_register_device(priv->rtc);
+	ret = devm_rtc_register_device(priv->rtc);
 	if (ret) {
 		mc13xxx_lock(mc13xxx);
 		goto err_irq_request;
drivers/rtc/rtc-meson-vrtc.c +1 -1
index e6bd0808a092..1463c8621561 100644
@@ -83,7 +83,7 @@ static int meson_vrtc_probe(struct platform_device *pdev)
 		return PTR_ERR(vrtc->rtc);
 
 	vrtc->rtc->ops = &meson_vrtc_ops;
-	return rtc_register_device(vrtc->rtc);
+	return devm_rtc_register_device(vrtc->rtc);
 }
 
 static int __maybe_unused meson_vrtc_suspend(struct device *dev)
drivers/rtc/rtc-meson.c +1 -1
index 938267713a4d..8642c06565ea 100644
@@ -369,7 +369,7 @@ static int meson_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		goto out_disable_vdd;
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto out_disable_vdd;
 
drivers/rtc/rtc-mpc5121.c +1 -1
index 5c2ce71aa044..bb2ea9bc56f2 100644
@@ -371,7 +371,7 @@ static int mpc5121_rtc_probe(struct platform_device *op)
 		rtc->rtc->range_max = U32_MAX;
 	}
 
-	err = rtc_register_device(rtc->rtc);
+	err = devm_rtc_register_device(rtc->rtc);
 	if (err)
 		goto out_dispose2;
 
drivers/rtc/rtc-mrst.c +1 -1
index 17bf5394e1e5..421b3b6071b6 100644
@@ -361,7 +361,7 @@ static int vrtc_mrst_do_probe(struct device *dev, struct resource *iomem,
 		}
 	}
 
-	retval = rtc_register_device(mrst_rtc.rtc);
+	retval = devm_rtc_register_device(mrst_rtc.rtc);
 	if (retval)
 		goto cleanup0;
 
drivers/rtc/rtc-mt2712.c +1 -1
index d5f691c8a035..cd92a9788351 100644
@@ -352,7 +352,7 @@ static int mt2712_rtc_probe(struct platform_device *pdev)
 	mt2712_rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	mt2712_rtc->rtc->range_max = MT2712_RTC_TIMESTAMP_END_2127;
 
-	return rtc_register_device(mt2712_rtc->rtc);
+	return devm_rtc_register_device(mt2712_rtc->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-mt6397.c +1 -1
index 1894aded4c85..6655035e5164 100644
@@ -301,7 +301,7 @@ static int mtk_rtc_probe(struct platform_device *pdev)
 
 	rtc->rtc_dev->ops = &mtk_rtc_ops;
 
-	return rtc_register_device(rtc->rtc_dev);
+	return devm_rtc_register_device(rtc->rtc_dev);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-mv.c +1 -1
index d5f190e578e4..f8e2ecea1d8d 100644
@@ -278,7 +278,7 @@ static int __init mv_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	pdata->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (!ret)
 		return 0;
 out:
drivers/rtc/rtc-mxc.c +1 -1
index a8cfbde048f4..85e23efb8433 100644
@@ -428,7 +428,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
 			dev_err(&pdev->dev, "failed to enable irq wake\n");
 	}
 
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 
 	return ret;
 }
drivers/rtc/rtc-mxc_v2.c +1 -1
index 91534560fe2a..0d73f6f0cf9e 100644
@@ -354,7 +354,7 @@ static int mxc_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret < 0)
 		clk_unprepare(pdata->clk);
 
drivers/rtc/rtc-omap.c +1 -1
index e65f79fc7718..dc7db2477f88 100644
@@ -886,7 +886,7 @@ static int omap_rtc_probe(struct platform_device *pdev)
 		goto err;
 	}
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto err;
 
drivers/rtc/rtc-pcap.c +1 -1
index 178bfb1dea21..8c7a98a5452c 100644
@@ -163,7 +163,7 @@ static int __init pcap_rtc_probe(struct platform_device *pdev)
 	if (err)
 		return err;
 
-	return rtc_register_device(pcap_rtc->rtc);
+	return devm_rtc_register_device(pcap_rtc->rtc);
 }
 
 static int __exit pcap_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-pcf2123.c +1 -1
index c3691fa4210e..534ffc91eec1 100644
@@ -434,7 +434,7 @@ static int pcf2123_probe(struct spi_device *spi)
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rtc->set_start_time = true;
 
-	ret = rtc_register_device(rtc);
+	ret = devm_rtc_register_device(rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-pcf2127.c +1 -1
index b803bbbca7b8..c19377fe1f71 100644
@@ -680,7 +680,7 @@ static int pcf2127_probe(struct device *dev, struct regmap *regmap,
 		return ret;
 	}
 
-	return rtc_register_device(pcf2127->rtc);
+	return devm_rtc_register_device(pcf2127->rtc);
 }
 
 #ifdef CONFIG_OF
drivers/rtc/rtc-pcf85063.c +1 -1
index c19f139e9b8d..e19cf2adbc35 100644
@@ -614,7 +614,7 @@ static int pcf85063_probe(struct i2c_client *client)
 	pcf85063_clkout_register_clk(pcf85063);
 #endif
 
-	return rtc_register_device(pcf85063->rtc);
+	return devm_rtc_register_device(pcf85063->rtc);
 }
 
 #ifdef CONFIG_OF
drivers/rtc/rtc-pcf85363.c +1 -1
index 23cf14ca2c96..a574c8d15a5c 100644
@@ -418,7 +418,7 @@ static int pcf85363_probe(struct i2c_client *client,
 			pcf85363->rtc->ops = &rtc_ops_alarm;
 	}
 
-	ret = rtc_register_device(pcf85363->rtc);
+	ret = devm_rtc_register_device(pcf85363->rtc);
 
 	for (i = 0; i < config->num_nvram; i++) {
 		nvmem_cfg[i].priv = pcf85363;
drivers/rtc/rtc-pcf8563.c +1 -1
index 2dc30eafa639..de3e6c355f2e 100644
@@ -582,7 +582,7 @@ static int pcf8563_probe(struct i2c_client *client,
 		}
 	}
 
-	err = rtc_register_device(pcf8563->rtc);
+	err = devm_rtc_register_device(pcf8563->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-pic32.c +1 -1
index 2b6946744654..7fb9145c43bd 100644
@@ -338,7 +338,7 @@ static int pic32_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	pdata->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret)
 		goto err_nortc;
 
drivers/rtc/rtc-pl030.c +1 -1
index ebe03eba8f5f..5a880516f3e8 100644
@@ -121,7 +121,7 @@ static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
 	if (ret)
 		goto err_irq;
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto err_reg;
 
drivers/rtc/rtc-pl031.c +1 -1
index c6b89273feba..041a60365048 100644
@@ -368,7 +368,7 @@ static int pl031_probe(struct amba_device *adev, const struct amba_id *id)
 	ldata->rtc->range_min = vendor->range_min;
 	ldata->rtc->range_max = vendor->range_max;
 
-	ret = rtc_register_device(ldata->rtc);
+	ret = devm_rtc_register_device(ldata->rtc);
 	if (ret)
 		goto out;
 
drivers/rtc/rtc-pm8xxx.c +1 -1
index b45ee2cb2c04..0d9dd6faabba 100644
@@ -508,7 +508,7 @@ static int pm8xxx_rtc_probe(struct platform_device *pdev)
 		return rc;
 	}
 
-	return rtc_register_device(rtc_dd->rtc);
+	return devm_rtc_register_device(rtc_dd->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-ps3.c +1 -1
index f0336d691e6c..6b098734c715 100644
@@ -56,7 +56,7 @@ static int __init ps3_rtc_probe(struct platform_device *dev)
 
 	platform_set_drvdata(dev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver ps3_rtc_driver = {
drivers/rtc/rtc-r9701.c +1 -1
index 7ceb968f0e44..60a3c3d7499b 100644
@@ -127,7 +127,7 @@ static int r9701_probe(struct spi_device *spi)
 	rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct spi_driver r9701_driver = {
drivers/rtc/rtc-rc5t619.c +1 -1
index dd1a20977478..e73102a39f1b 100644
@@ -426,7 +426,7 @@ static int rc5t619_rtc_probe(struct platform_device *pdev)
 		dev_warn(&pdev->dev, "rc5t619 interrupt is disabled\n");
 	}
 
-	return rtc_register_device(rtc->rtc);
+	return devm_rtc_register_device(rtc->rtc);
 }
 
 static struct platform_driver rc5t619_rtc_driver = {
drivers/rtc/rtc-rk808.c +1 -1
index c0334c602e88..e920da8c08da 100644
@@ -447,7 +447,7 @@ static int rk808_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	return rtc_register_device(rk808_rtc->rtc);
+	return devm_rtc_register_device(rk808_rtc->rtc);
 }
 
 static struct platform_driver rk808_rtc_driver = {
drivers/rtc/rtc-rp5c01.c +1 -1
index 8bc476c0905f..44afa6d996e7 100644
@@ -259,7 +259,7 @@ static int __init rp5c01_rtc_probe(struct platform_device *dev)
 	if (error)
 		return error;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver rp5c01_rtc_driver = {
drivers/rtc/rtc-rs5c348.c +1 -1
index 47c13678449e..fec633f80789 100644
@@ -197,7 +197,7 @@ static int rs5c348_probe(struct spi_device *spi)
 
 	rtc->ops = &rs5c348_rtc_ops;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct spi_driver rs5c348_driver = {
drivers/rtc/rtc-rv3028.c +1 -1
index f788df979750..979407a51c7a 100644
@@ -886,7 +886,7 @@ static int rv3028_probe(struct i2c_client *client)
 	rv3028->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv3028->rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rv3028->rtc->ops = &rv3028_rtc_ops;
-	ret = rtc_register_device(rv3028->rtc);
+	ret = devm_rtc_register_device(rv3028->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-rv3029c2.c +1 -1
index ad359b3b74b2..dc1bda62095e 100644
@@ -750,7 +750,7 @@ static int rv3029_probe(struct device *dev, struct regmap *regmap, int irq,
 	rv3029->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv3029->rtc->range_max = RTC_TIMESTAMP_END_2079;
 
-	rc = rtc_register_device(rv3029->rtc);
+	rc = devm_rtc_register_device(rv3029->rtc);
 	if (rc)
 		return rc;
 
drivers/rtc/rtc-rv3032.c +1 -1
index c95fa7cd0bfe..09d9527a3637 100644
@@ -885,7 +885,7 @@ static int rv3032_probe(struct i2c_client *client)
 	rv3032->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv3032->rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rv3032->rtc->ops = &rv3032_rtc_ops;
-	ret = rtc_register_device(rv3032->rtc);
+	ret = devm_rtc_register_device(rv3032->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-rv8803.c +1 -1
index 44e1818a751c..d4ea6db51b26 100644
@@ -587,7 +587,7 @@ static int rv8803_probe(struct i2c_client *client,
 	rv8803->rtc->ops = &rv8803_rtc_ops;
 	rv8803->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rv8803->rtc->range_max = RTC_TIMESTAMP_END_2099;
-	err = rtc_register_device(rv8803->rtc);
+	err = devm_rtc_register_device(rv8803->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-rx8010.c +1 -1
index dca41a2a39b2..8340ab47a059 100644
@@ -419,7 +419,7 @@ static int rx8010_probe(struct i2c_client *client)
 	rx8010->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	rx8010->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(rx8010->rtc);
+	return devm_rtc_register_device(rx8010->rtc);
 }
 
 static struct i2c_driver rx8010_driver = {
drivers/rtc/rtc-rx8581.c +1 -1
index 017f74721cc0..de109139529b 100644
@@ -298,7 +298,7 @@ static int rx8581_probe(struct i2c_client *client,
 	rx8581->rtc->start_secs = 0;
 	rx8581->rtc->set_start_time = true;
 
-	ret = rtc_register_device(rx8581->rtc);
+	ret = devm_rtc_register_device(rx8581->rtc);
 
 	for (i = 0; i < config->num_nvram; i++) {
 		nvmem_cfg[i].priv = rx8581;
drivers/rtc/rtc-s35390a.c +1 -1
index 03672a246356..ea15d0392bb9 100644
@@ -497,7 +497,7 @@ static int s35390a_probe(struct i2c_client *client,
 	if (status1 & S35390A_FLAG_INT2)
 		rtc_update_irq(s35390a->rtc, 1, RTC_AF);
 
-	return rtc_register_device(s35390a->rtc);
+	return devm_rtc_register_device(s35390a->rtc);
 }
 
 static struct i2c_driver s35390a_driver = {
drivers/rtc/rtc-sa1100.c +1 -1
index 9ccc97cf5e09..1250887e4382 100644
@@ -205,7 +205,7 @@ int sa1100_rtc_init(struct platform_device *pdev, struct sa1100_rtc *info)
 	info->rtc->max_user_freq = RTC_FREQ;
 	info->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(info->rtc);
+	ret = devm_rtc_register_device(info->rtc);
 	if (ret) {
 		clk_disable_unprepare(info->clk);
 		return ret;
drivers/rtc/rtc-sc27xx.c +1 -1
index 8e3d6be990c5..324398fefc4f 100644
@@ -648,7 +648,7 @@ static int sprd_rtc_probe(struct platform_device *pdev)
 	rtc->rtc->ops = &sprd_rtc_ops;
 	rtc->rtc->range_min = 0;
 	rtc->rtc->range_max = 5662310399LL;
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret) {
 		device_init_wakeup(&pdev->dev, 0);
 		return ret;
drivers/rtc/rtc-sd3078.c +1 -1
index a7aa943c1183..f6bee69ba017 100644
@@ -192,7 +192,7 @@ static int sd3078_probe(struct i2c_client *client,
 	sd3078->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	sd3078->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	ret = rtc_register_device(sd3078->rtc);
+	ret = devm_rtc_register_device(sd3078->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-sh.c +1 -1
index 9167b48014a1..cd146b574143 100644
@@ -607,7 +607,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
 		rtc->rtc_dev->range_max = mktime64(2098, 12, 31, 23, 59, 59);
 	}
 
-	ret = rtc_register_device(rtc->rtc_dev);
+	ret = devm_rtc_register_device(rtc->rtc_dev);
 	if (ret)
 		goto err_unmap;
 
drivers/rtc/rtc-sirfsoc.c +1 -1
index abf19435dbad..03a6cca23201 100644
@@ -356,7 +356,7 @@ static int sirfsoc_rtc_probe(struct platform_device *pdev)
 		return err;
 	}
 
-	return rtc_register_device(rtcdrv->rtc);
+	return devm_rtc_register_device(rtcdrv->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-snvs.c +1 -1
index 0263d996b8a8..b5f1791a7255 100644
@@ -405,7 +405,7 @@ static int snvs_rtc_probe(struct platform_device *pdev)
 	data->rtc->ops = &snvs_rtc_ops;
 	data->rtc->range_max = U32_MAX;
 
-	return rtc_register_device(data->rtc);
+	return devm_rtc_register_device(data->rtc);
 }
 
 static int __maybe_unused snvs_rtc_suspend_noirq(struct device *dev)
drivers/rtc/rtc-st-lpc.c +1 -1
index 0c65448b85ee..bdb20f63254e 100644
@@ -250,7 +250,7 @@ static int st_rtc_probe(struct platform_device *pdev)
 	rtc->rtc_dev->range_max = U64_MAX;
 	do_div(rtc->rtc_dev->range_max, rtc->clkrate);
 
-	ret = rtc_register_device(rtc->rtc_dev);
+	ret = devm_rtc_register_device(rtc->rtc_dev);
 	if (ret) {
 		clk_disable_unprepare(rtc->clk);
 		return ret;
drivers/rtc/rtc-starfire.c +1 -1
index 37a26279e107..fbd1ed41cbf1 100644
@@ -48,7 +48,7 @@ static int __init starfire_rtc_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver starfire_rtc_driver = {
drivers/rtc/rtc-stk17ta8.c +1 -1
index ad616bce7bca..7cb6be1b7815 100644
@@ -317,7 +317,7 @@ static int stk17ta8_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(pdata->rtc);
+	return devm_rtc_register_device(pdata->rtc);
 }
 
 /* work with hotplug and coldplug */
drivers/rtc/rtc-stmp3xxx.c +1 -1
index 0a969af80af7..40c0f7ed36e0 100644
@@ -366,7 +366,7 @@ static int stmp3xxx_rtc_probe(struct platform_device *pdev)
 	rtc_data->rtc->ops = &stmp3xxx_rtc_ops;
 	rtc_data->rtc->range_max = U32_MAX;
 
-	err = rtc_register_device(rtc_data->rtc);
+	err = devm_rtc_register_device(rtc_data->rtc);
 	if (err)
 		return err;
 
drivers/rtc/rtc-sun4v.c +1 -1
index 036463dfa103..a86e27de8c06 100644
@@ -86,7 +86,7 @@ static int __init sun4v_rtc_probe(struct platform_device *pdev)
 	rtc->range_max = U64_MAX;
 	platform_set_drvdata(pdev, rtc);
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver sun4v_rtc_driver = {
drivers/rtc/rtc-sun6i.c +1 -1
index e2b8b150bcb4..9739f8640f63 100644
@@ -724,7 +724,7 @@ static int sun6i_rtc_probe(struct platform_device *pdev)
 	chip->rtc->ops = &sun6i_rtc_ops;
 	chip->rtc->range_max = 2019686399LL; /* 2033-12-31 23:59:59 */
 
-	ret = rtc_register_device(chip->rtc);
+	ret = devm_rtc_register_device(chip->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-sunxi.c +1 -1
index f5d7f44550ce..5d019e3a835a 100644
@@ -470,7 +470,7 @@ static int sunxi_rtc_probe(struct platform_device *pdev)
 
 	chip->rtc->ops = &sunxi_rtc_ops;
 
-	return rtc_register_device(chip->rtc);
+	return devm_rtc_register_device(chip->rtc);
 }
 
 static struct platform_driver sunxi_rtc_driver = {
drivers/rtc/rtc-tegra.c +1 -1
index 7fbb1741692f..8925015cc698 100644
@@ -329,7 +329,7 @@ static int tegra_rtc_probe(struct platform_device *pdev)
 		goto disable_clk;
 	}
 
-	ret = rtc_register_device(info->rtc);
+	ret = devm_rtc_register_device(info->rtc);
 	if (ret)
 		goto disable_clk;
 
drivers/rtc/rtc-test.c +1 -1
index 74b3a0603b73..b092a1648513 100644
@@ -139,7 +139,7 @@ static int test_probe(struct platform_device *plat_dev)
 	timer_setup(&rtd->alarm, test_rtc_alarm_handler, 0);
 	rtd->alarm.expires = 0;
 
-	return rtc_register_device(rtd->rtc);
+	return devm_rtc_register_device(rtd->rtc);
 }
 
 static struct platform_driver test_driver = {
drivers/rtc/rtc-tps6586x.c +1 -1
index e39af2d67051..a980337c3065 100644
@@ -280,7 +280,7 @@ static int tps6586x_rtc_probe(struct platform_device *pdev)
 		goto fail_rtc_register;
 	}
 
-	ret = rtc_register_device(rtc->rtc);
+	ret = devm_rtc_register_device(rtc->rtc);
 	if (ret)
 		goto fail_rtc_register;
 
drivers/rtc/rtc-tps65910.c +1 -1
index e3840386f430..2d87b62826a8 100644
@@ -434,7 +434,7 @@ static int tps65910_rtc_probe(struct platform_device *pdev)
 	tps_rtc->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000;
 	tps_rtc->rtc->range_max = RTC_TIMESTAMP_END_2099;
 
-	return rtc_register_device(tps_rtc->rtc);
+	return devm_rtc_register_device(tps_rtc->rtc);
 }
 
 #ifdef CONFIG_PM_SLEEP
drivers/rtc/rtc-tx4939.c +1 -1
index 11f46272bad3..c3309db5448d 100644
@@ -275,7 +275,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev)
 	if (ret)
 		return ret;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static int __exit tx4939_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-vr41xx.c +1 -1
index c3671043ace7..5a9f9ad86d32 100644
@@ -335,7 +335,7 @@ static int rtc_probe(struct platform_device *pdev)
 
 	dev_info(&pdev->dev, "Real Time Clock of NEC VR4100 series\n");
 
-	retval = rtc_register_device(rtc);
+	retval = devm_rtc_register_device(rtc);
 	if (retval)
 		goto err_iounmap_all;
 
drivers/rtc/rtc-vt8500.c +1 -1
index e2588625025f..197b649cd629 100644
@@ -232,7 +232,7 @@ static int vt8500_rtc_probe(struct platform_device *pdev)
 		return ret;
 	}
 
-	return rtc_register_device(vt8500_rtc->rtc);
+	return devm_rtc_register_device(vt8500_rtc->rtc);
 }
 
 static int vt8500_rtc_remove(struct platform_device *pdev)
drivers/rtc/rtc-wilco-ec.c +1 -1
index ff46066a68a4..2a205a646452 100644
@@ -176,7 +176,7 @@ static int wilco_ec_rtc_probe(struct platform_device *pdev)
 	rtc->range_max = RTC_TIMESTAMP_END_2099;
 	rtc->owner = THIS_MODULE;
 
-	return rtc_register_device(rtc);
+	return devm_rtc_register_device(rtc);
 }
 
 static struct platform_driver wilco_ec_rtc_driver = {
drivers/rtc/rtc-wm831x.c +1 -1
index ccef887d2690..640833e21057 100644
@@ -429,7 +429,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev)
 	wm831x_rtc->rtc->ops = &wm831x_rtc_ops;
 	wm831x_rtc->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(wm831x_rtc->rtc);
+	ret = devm_rtc_register_device(wm831x_rtc->rtc);
 	if (ret)
 		return ret;
 
drivers/rtc/rtc-xgene.c +1 -1
index 96db441f92b3..cf68a9b1c9eb 100644
@@ -185,7 +185,7 @@ static int xgene_rtc_probe(struct platform_device *pdev)
 	pdata->rtc->ops = &xgene_rtc_ops;
 	pdata->rtc->range_max = U32_MAX;
 
-	ret = rtc_register_device(pdata->rtc);
+	ret = devm_rtc_register_device(pdata->rtc);
 	if (ret) {
 		clk_disable_unprepare(pdata->clk);
 		return ret;
drivers/rtc/rtc-zynqmp.c +1 -1
index 4b1077e2f826..f440bb52be92 100644
@@ -264,7 +264,7 @@ static int xlnx_rtc_probe(struct platform_device *pdev)
 
 	device_init_wakeup(&pdev->dev, 1);
 
-	return rtc_register_device(xrtcdev->rtc);
+	return devm_rtc_register_device(xrtcdev->rtc);
 }
 
 static int xlnx_rtc_remove(struct platform_device *pdev)
drivers/rtc/sysfs.c +0 -2
index 950fac0d41ff..8a957d31a1a4 100644
@@ -317,8 +317,6 @@ int rtc_add_groups(struct rtc_device *rtc, const struct attribute_group **grps)
 	size_t old_cnt = 0, add_cnt = 0, new_cnt;
 	const struct attribute_group **groups, **old;
 
-	if (rtc->registered)
-		return -EINVAL;
 	if (!grps)
 		return -EINVAL;
 
include/linux/rtc.h +3 -5
index cbca651d8ca4..55e7beed066c 100644
@@ -118,8 +118,6 @@ struct rtc_device {
 	 */
 	long set_offset_nsec;
 
-	bool registered;
-
 	time64_t range_min;
 	timeu64_t range_max;
 	time64_t start_secs;
@@ -157,7 +155,7 @@ extern struct rtc_device *devm_rtc_device_register(struct device *dev,
 					const struct rtc_class_ops *ops,
 					struct module *owner);
 struct rtc_device *devm_rtc_allocate_device(struct device *dev);
-int __rtc_register_device(struct module *owner, struct rtc_device *rtc);
+int __devm_rtc_register_device(struct module *owner, struct rtc_device *rtc);
 
 extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm);
 extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm);
@@ -234,8 +232,8 @@ static inline bool rtc_tv_nsec_ok(s64 set_offset_nsec,
 	return false;
 }
 
-#define rtc_register_device(device) \
-	__rtc_register_device(THIS_MODULE, device)
+#define devm_rtc_register_device(device) \
+	__devm_rtc_register_device(THIS_MODULE, device)
 
 #ifdef CONFIG_RTC_HCTOSYS_DEVICE
 extern int rtc_hctosys_ret;
Signature · 1 line
2.29.1
Signature · 3 lines
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
maintainer Applied
#15 lore raw
In reply to Bartosz Golaszewski
Quoted 10 lines · Bartosz Golaszewski

As discussed: this is my take on RTC devres. The series does a couple things:
it adds missing documentation of managed RTC functions, adds the 'devm_' prefix to managed APIs, makes the rtc_device struct unaware of being managed (removes the registered field) and also shrinks devm_rtc_allocate_device().

Other than that, there are some semi-related patches in here, like the one using the managed variant of pinctrl_register() in rtc-omap and another one adding a generic error message when nvmem registraton fails.

[...]

Applied, thanks!

[1/8] rtc: omap: use devm_pinctrl_register()

      commit: a2d41cdac82332c52c13cb2ef225804eabd5a17c
[3/8] Documentation: list RTC devres helpers in devres.rst
      commit: 9700e2835743c98a9867711133c64cc7f57be477
[4/8] rtc: nvmem: remove nvram ABI
      commit: 003006f324d265b69afd18496bc06ee076c70d72
[5/8] rtc: add devm_ prefix to rtc_nvmem_register()
      commit: ae1907b39574c545e4c5f0e038e85d57f6358080
[6/8] rtc: nvmem: emit an error message when nvmem registration fails
      commit: ffb1ecf7f7cc3e0b6f3fc7f445cc405ccb52d048
[7/8] rtc: rework rtc_register_device() resource management
      commit: 9703f757249afc4c558c8712e953b5b33a73e379
[8/8] rtc: shrink devm_rtc_allocate_device()
      commit: 27f554c580c8ec9015aec3d998510cf462534e48

Best regards,

Signature · 1 line
Alexandre Belloni <[email protected]>
#10 lore raw

Re: [PATCH 7/8] rtc: rework rtc_register_device() resource management

In reply to Alexandre Belloni
Quoted 19 lines · Alexandre Belloni
Quoted 11 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

rtc_register_device() is a managed interface but it doesn't use devres by itself - instead it marks an rtc_device as "registered" and the devres callback for devm_rtc_allocate_device() takes care of resource release.

This doesn't correspond with the design behind devres where managed structures should not be aware of being managed. The correct solution here is to register a separate devres callback for unregistering the device.

Quoted 5 lines

While at it: rename rtc_register_device() to devm_rtc_register_device() and add it to the list of managed interfaces in devres.rst. This way we can avoid any potential confusion of driver developers who may expect there to exist a corresponding unregister function.

Quoted 5 lines

I'm going to apply that but honestly, I don't like the fact that we now end up with both devm_rtc_device_register and devm_rtc_register_device. This was the main reason to not have the devm_ prefix there. I find that way more confusing than the current situation.

Yes, it's unfortunate that we have two similarly named functions but devm_rtc_device_register() is deprecated and should go away right? In that case it's just temporary. Additionally: since it's just a wrapper around devm_rtc_allocate_device() and devm_rtc_register_device() now, we should be able to just replace the code in the drivers with the code from devm_rtc_device_register() and we may be able to get rid of it soon?

Bartosz

#12 lore raw

Re: [PATCH 7/8] rtc: rework rtc_register_device() resource management

In reply to a message not in the archive
Quoted 21 lines · Lee Jones
Quoted 17 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

rtc_register_device() is a managed interface but it doesn't use devres by itself - instead it marks an rtc_device as "registered" and the devres callback for devm_rtc_allocate_device() takes care of resource release.

This doesn't correspond with the design behind devres where managed structures should not be aware of being managed. The correct solution here is to register a separate devres callback for unregistering the device.

While at it: rename rtc_register_device() to devm_rtc_register_device() and add it to the list of managed interfaces in devres.rst. This way we can avoid any potential confusion of driver developers who may expect there to exist a corresponding unregister function.

Quoted 9 lines
Quoted 5 lines
---
 .../driver-api/driver-model/devres.rst        |  1 +
 arch/alpha/kernel/rtc.c                       |  2 +-
 drivers/mfd/menelaus.c                        |  2 +-

This patch should have been sent to and Acked by MFD too.

Sorry Lee, I missed the fact that there were changes outside of drivers/rtc/. Other than skipping the MFD maintainer - do you see anything wrong in that bit?

Bartosz

#13 lore raw

Re: [PATCH 7/8] rtc: rework rtc_register_device() resource management

Quoted 29 lines · Bartosz Golaszewski
Quoted 28 lines · Lee Jones
Quoted 22 lines · Bartosz Golaszewski

From: Bartosz Golaszewski <[email protected]>

rtc_register_device() is a managed interface but it doesn't use devres by itself - instead it marks an rtc_device as "registered" and the devres callback for devm_rtc_allocate_device() takes care of resource release.

This doesn't correspond with the design behind devres where managed structures should not be aware of being managed. The correct solution here is to register a separate devres callback for unregistering the device.

While at it: rename rtc_register_device() to devm_rtc_register_device() and add it to the list of managed interfaces in devres.rst. This way we can avoid any potential confusion of driver developers who may expect there to exist a corresponding unregister function.

---
 .../driver-api/driver-model/devres.rst        |  1 +
 arch/alpha/kernel/rtc.c                       |  2 +-
 drivers/mfd/menelaus.c                        |  2 +-
Quoted 6 lines
Quoted 2 lines

This patch should have been sent to and Acked by MFD too.

Sorry Lee, I missed the fact that there were changes outside of drivers/rtc/. Other than skipping the MFD maintainer - do you see anything wrong in that bit?

No real harm done.

The patch looks fine from an MFD standpoint.

Signature · 4 lines
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog