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: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Link: https://lore.kernel.org/r/20201109163409.24301-5-brgl@bgdev.pl

diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c
index 7c88d19..a99b7d2 100644 (file)
--- a/drivers/rtc/class.c
+++ b/drivers/rtc/class.c
@@ -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

diff --git a/drivers/rtc/nvmem.c b/drivers/rtc/nvmem.c
index 4312096..5e0b178 100644 (file)
--- a/drivers/rtc/nvmem.c
+++ b/drivers/rtc/nvmem.c
@@ -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);
-}

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index c633319..adca0de 100644 (file)
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -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;

diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index a3d7908..a1ed539 100644 (file)
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -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;

diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
index fdf25db..e359cbf 100644 (file)
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
@@ -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);
        }
 

diff --git a/drivers/rtc/rtc-ds1343.c b/drivers/rtc/rtc-ds1343.c
index ba14342..e7604e8 100644 (file)
--- a/drivers/rtc/rtc-ds1343.c
+++ b/drivers/rtc/rtc-ds1343.c
@@ -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;

diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c
index a63872c..33c483d 100644 (file)
--- a/drivers/rtc/rtc-ds1511.c
+++ b/drivers/rtc/rtc-ds1511.c
@@ -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;

diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c
index cdf5e05..c6a5563 100644 (file)
--- a/drivers/rtc/rtc-ds1553.c
+++ b/drivers/rtc/rtc-ds1553.c
@@ -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)

diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index dfbd7b8..9043c96 100644 (file)
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -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)

diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c
index 2b949f0..291bbed 100644 (file)
--- a/drivers/rtc/rtc-ds1742.c
+++ b/drivers/rtc/rtc-ds1742.c
@@ -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)

diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
index 67e2187..ee1d8f0 100644 (file)
--- a/drivers/rtc/rtc-m48t59.c
+++ b/drivers/rtc/rtc-m48t59.c
@@ -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;

diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c
index 75a0e73..2b11355 100644 (file)
--- a/drivers/rtc/rtc-m48t86.c
+++ b/drivers/rtc/rtc-m48t86.c
@@ -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)

diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c
index 8776ead..a69e8ad 100644 (file)
--- a/drivers/rtc/rtc-rp5c01.c
+++ b/drivers/rtc/rtc-rp5c01.c
@@ -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;
 

diff --git a/drivers/rtc/rtc-rv8803.c b/drivers/rtc/rtc-rv8803.c
index c6d8e34..1d888da 100644 (file)
--- a/drivers/rtc/rtc-rv8803.c
+++ b/drivers/rtc/rtc-rv8803.c
@@ -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);

diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c
index 01a4504..1ccf0d5 100644 (file)
--- a/drivers/rtc/rtc-stk17ta8.c
+++ b/drivers/rtc/rtc-stk17ta8.c
@@ -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);

diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index 715b829..abbb62b 100644 (file)
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -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;

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 22d1575..0983ab9 100644 (file)
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -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