Commit 25ece305 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: nvmem: remove nvram ABI 



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()]

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

drivers/rtc/class.c

+0 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -9,74 +9,7 @@ 
#include <linux/types.h>

#include <linux/nvmem-consumer.h>

#include <linux/rtc.h>

#include <linux/slab.h>

#include <linux/sysfs.h>



/*

 * Deprecated ABI compatibility, this should be removed at some point

 */



static const char nvram_warning[] = "Deprecated ABI, please use nvmem";



static ssize_t

rtc_nvram_read(struct file *filp, struct kobject *kobj,

	       struct bin_attribute *attr,

	       char *buf, loff_t off, size_t count)

{

	dev_warn_once(kobj_to_dev(kobj), nvram_warning);



	return nvmem_device_read(attr->private, off, count, buf);

}



static ssize_t

rtc_nvram_write(struct file *filp, struct kobject *kobj,

		struct bin_attribute *attr,

		char *buf, loff_t off, size_t count)

{

	dev_warn_once(kobj_to_dev(kobj), nvram_warning);



	return nvmem_device_write(attr->private, off, count, buf);

}



static int rtc_nvram_register(struct rtc_device *rtc,

			      struct nvmem_device *nvmem, size_t size)

{

	int err;



	rtc->nvram = kzalloc(sizeof(*rtc->nvram), GFP_KERNEL);

	if (!rtc->nvram)

		return -ENOMEM;



	rtc->nvram->attr.name = "nvram";

	rtc->nvram->attr.mode = 0644;

	rtc->nvram->private = nvmem;



	sysfs_bin_attr_init(rtc->nvram);



	rtc->nvram->read = rtc_nvram_read;

	rtc->nvram->write = rtc_nvram_write;

	rtc->nvram->size = size;



	err = sysfs_create_bin_file(&rtc->dev.parent->kobj,

				    rtc->nvram);

	if (err) {

		kfree(rtc->nvram);

		rtc->nvram = NULL;

	}



	return err;

}



static void rtc_nvram_unregister(struct rtc_device *rtc)

{

	sysfs_remove_bin_file(&rtc->dev.parent->kobj, rtc->nvram);

	kfree(rtc->nvram);

	rtc->nvram = NULL;

}



/*

 * New ABI, uses nvmem

 */

int rtc_nvmem_register(struct rtc_device *rtc,

		       struct nvmem_config *nvmem_config)

{
@@ -88,20 +21,7 @@ int rtc_nvmem_register(struct rtc_device *rtc, 
	nvmem_config->dev = rtc->dev.parent;

	nvmem_config->owner = rtc->owner;

	nvmem = devm_nvmem_register(rtc->dev.parent, nvmem_config);

	if (IS_ERR(nvmem))

		return PTR_ERR(nvmem);



	/* Register the old ABI */

	if (rtc->nvram_old_abi)

		rtc_nvram_register(rtc, nvmem, nvmem_config->size);



	return 0;

	return PTR_ERR_OR_ZERO(nvmem);

}

EXPORT_SYMBOL_GPL(rtc_nvmem_register);
 


void rtc_nvmem_unregister(struct rtc_device *rtc)

{

	/* unregister the old ABI */

	if (rtc->nvram)

		rtc_nvram_unregister(rtc);

}

drivers/rtc/rtc-cmos.c

+0 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -2016,7 +2016,6 @@ static int ds1307_probe(struct i2c_client *client, 
			.priv = ds1307,

		};



		ds1307->rtc->nvram_old_abi = true;

		rtc_nvmem_register(ds1307->rtc, &nvmem_cfg);

	}