Commit 3a905c2d authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Alexandre Belloni
Browse files

rtc: add devm_ prefix to rtc_nvmem_register() 



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/.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201109163409.24301-6-brgl@bgdev.pl
parent 25ece305

Documentation/driver-api/driver-model/devres.rst

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2016,7 +2016,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);