nvmem: core: remove nvmem_sysfs_get_groups()
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Wed, 25 Mar 2020 13:19:51 +0000 (13:19 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 25 Mar 2020 18:23:49 +0000 (19:23 +0100)
Now that we are using is_bin_visible callback, we do not need
nvmem_sysfs_get_groups() anymore so move all the relevant data-structures
and code to core.c

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200325131951.31887-3-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvmem/Makefile
drivers/nvmem/core.c
drivers/nvmem/nvmem-sysfs.c [deleted file]
drivers/nvmem/nvmem.h [deleted file]

index 65a268d..a7c3772 100644 (file)
@@ -6,9 +6,6 @@
 obj-$(CONFIG_NVMEM)            += nvmem_core.o
 nvmem_core-y                   := core.o
 
-obj-$(CONFIG_NVMEM_SYSFS)      += nvmem_sysfs.o
-nvmem_sysfs-y                  := nvmem-sysfs.o
-
 # Devices
 obj-$(CONFIG_NVMEM_BCM_OCOTP)  += nvmem-bcm-ocotp.o
 nvmem-bcm-ocotp-y              := bcm-ocotp.o
index 4770852..05c6ae4 100644 (file)
 #include <linux/gpio/consumer.h>
 #include <linux/of.h>
 #include <linux/slab.h>
-#include "nvmem.h"
+
+struct nvmem_device {
+       struct module           *owner;
+       struct device           dev;
+       int                     stride;
+       int                     word_size;
+       int                     id;
+       struct kref             refcnt;
+       size_t                  size;
+       bool                    read_only;
+       bool                    root_only;
+       int                     flags;
+       enum nvmem_type         type;
+       struct bin_attribute    eeprom;
+       struct device           *base_dev;
+       struct list_head        cells;
+       nvmem_reg_read_t        reg_read;
+       nvmem_reg_write_t       reg_write;
+       struct gpio_desc        *wp_gpio;
+       void *priv;
+};
+
+#define to_nvmem_device(d) container_of(d, struct nvmem_device, dev)
+
+#define FLAG_COMPAT            BIT(0)
 
 struct nvmem_cell {
        const char              *name;
@@ -42,6 +66,250 @@ static LIST_HEAD(nvmem_lookup_list);
 
 static BLOCKING_NOTIFIER_HEAD(nvmem_notifier);
 
+#ifdef CONFIG_NVMEM_SYSFS
+static const char * const nvmem_type_str[] = {
+       [NVMEM_TYPE_UNKNOWN] = "Unknown",
+       [NVMEM_TYPE_EEPROM] = "EEPROM",
+       [NVMEM_TYPE_OTP] = "OTP",
+       [NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",
+};
+
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+static struct lock_class_key eeprom_lock_key;
+#endif
+
+static ssize_t type_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
+{
+       struct nvmem_device *nvmem = to_nvmem_device(dev);
+
+       return sprintf(buf, "%s\n", nvmem_type_str[nvmem->type]);
+}
+
+static DEVICE_ATTR_RO(type);
+
+static struct attribute *nvmem_attrs[] = {
+       &dev_attr_type.attr,
+       NULL,
+};
+
+static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
+                                  struct bin_attribute *attr, char *buf,
+                                  loff_t pos, size_t count)
+{
+       struct device *dev;
+       struct nvmem_device *nvmem;
+       int rc;
+
+       if (attr->private)
+               dev = attr->private;
+       else
+               dev = container_of(kobj, struct device, kobj);
+       nvmem = to_nvmem_device(dev);
+
+       /* Stop the user from reading */
+       if (pos >= nvmem->size)
+               return 0;
+
+       if (count < nvmem->word_size)
+               return -EINVAL;
+
+       if (pos + count > nvmem->size)
+               count = nvmem->size - pos;
+
+       count = round_down(count, nvmem->word_size);
+
+       if (!nvmem->reg_read)
+               return -EPERM;
+
+       rc = nvmem->reg_read(nvmem->priv, pos, buf, count);
+
+       if (rc)
+               return rc;
+
+       return count;
+}
+
+static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
+                                   struct bin_attribute *attr, char *buf,
+                                   loff_t pos, size_t count)
+{
+       struct device *dev;
+       struct nvmem_device *nvmem;
+       int rc;
+
+       if (attr->private)
+               dev = attr->private;
+       else
+               dev = container_of(kobj, struct device, kobj);
+       nvmem = to_nvmem_device(dev);
+
+       /* Stop the user from writing */
+       if (pos >= nvmem->size)
+               return -EFBIG;
+
+       if (count < nvmem->word_size)
+               return -EINVAL;
+
+       if (pos + count > nvmem->size)
+               count = nvmem->size - pos;
+
+       count = round_down(count, nvmem->word_size);
+
+       if (!nvmem->reg_write)
+               return -EPERM;
+
+       rc = nvmem->reg_write(nvmem->priv, pos, buf, count);
+
+       if (rc)
+               return rc;
+
+       return count;
+}
+
+static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
+                                        struct bin_attribute *attr, int i)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct nvmem_device *nvmem = to_nvmem_device(dev);
+       umode_t mode = 0400;
+
+       if (!nvmem->root_only)
+               mode |= 0044;
+
+       if (!nvmem->read_only)
+               mode |= 0200;
+
+       if (!nvmem->reg_write)
+               mode &= ~0200;
+
+       if (!nvmem->reg_read)
+               mode &= ~0444;
+
+       return mode;
+}
+
+/* default read/write permissions */
+static struct bin_attribute bin_attr_rw_nvmem = {
+       .attr   = {
+               .name   = "nvmem",
+               .mode   = 0644,
+       },
+       .read   = bin_attr_nvmem_read,
+       .write  = bin_attr_nvmem_write,
+};
+
+static struct bin_attribute *nvmem_bin_attributes[] = {
+       &bin_attr_rw_nvmem,
+       NULL,
+};
+
+static const struct attribute_group nvmem_bin_group = {
+       .bin_attrs      = nvmem_bin_attributes,
+       .attrs          = nvmem_attrs,
+       .is_bin_visible = nvmem_bin_attr_is_visible,
+};
+
+static const struct attribute_group *nvmem_dev_groups[] = {
+       &nvmem_bin_group,
+       NULL,
+};
+
+/* read only permission */
+static struct bin_attribute bin_attr_ro_nvmem = {
+       .attr   = {
+               .name   = "nvmem",
+               .mode   = 0444,
+       },
+       .read   = bin_attr_nvmem_read,
+};
+
+/* default read/write permissions, root only */
+static struct bin_attribute bin_attr_rw_root_nvmem = {
+       .attr   = {
+               .name   = "nvmem",
+               .mode   = 0600,
+       },
+       .read   = bin_attr_nvmem_read,
+       .write  = bin_attr_nvmem_write,
+};
+
+/* read only permission, root only */
+static struct bin_attribute bin_attr_ro_root_nvmem = {
+       .attr   = {
+               .name   = "nvmem",
+               .mode   = 0400,
+       },
+       .read   = bin_attr_nvmem_read,
+};
+
+/*
+ * nvmem_setup_compat() - Create an additional binary entry in
+ * drivers sys directory, to be backwards compatible with the older
+ * drivers/misc/eeprom drivers.
+ */
+static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
+                                   const struct nvmem_config *config)
+{
+       int rval;
+
+       if (!config->compat)
+               return 0;
+
+       if (!config->base_dev)
+               return -EINVAL;
+
+       if (nvmem->read_only) {
+               if (config->root_only)
+                       nvmem->eeprom = bin_attr_ro_root_nvmem;
+               else
+                       nvmem->eeprom = bin_attr_ro_nvmem;
+       } else {
+               if (config->root_only)
+                       nvmem->eeprom = bin_attr_rw_root_nvmem;
+               else
+                       nvmem->eeprom = bin_attr_rw_nvmem;
+       }
+       nvmem->eeprom.attr.name = "eeprom";
+       nvmem->eeprom.size = nvmem->size;
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+       nvmem->eeprom.attr.key = &eeprom_lock_key;
+#endif
+       nvmem->eeprom.private = &nvmem->dev;
+       nvmem->base_dev = config->base_dev;
+
+       rval = device_create_bin_file(nvmem->base_dev, &nvmem->eeprom);
+       if (rval) {
+               dev_err(&nvmem->dev,
+                       "Failed to create eeprom binary file %d\n", rval);
+               return rval;
+       }
+
+       nvmem->flags |= FLAG_COMPAT;
+
+       return 0;
+}
+
+static void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,
+                             const struct nvmem_config *config)
+{
+       if (config->compat)
+               device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
+}
+
+#else /* CONFIG_NVMEM_SYSFS */
+
+static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
+                                   const struct nvmem_config *config)
+{
+       return -ENOSYS;
+}
+static void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,
+                                     const struct nvmem_config *config)
+{
+}
+
+#endif /* CONFIG_NVMEM_SYSFS */
 
 static int nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
                          void *val, size_t bytes)
@@ -396,7 +664,9 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
        nvmem->read_only = device_property_present(config->dev, "read-only") ||
                           config->read_only || !nvmem->reg_write;
 
-       nvmem->dev.groups = nvmem_sysfs_get_groups();
+#ifdef CONFIG_NVMEM_SYSFS
+       nvmem->dev.groups = nvmem_dev_groups;
+#endif
 
        dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
 
diff --git a/drivers/nvmem/nvmem-sysfs.c b/drivers/nvmem/nvmem-sysfs.c
deleted file mode 100644 (file)
index b1bb3e5..0000000
+++ /dev/null
@@ -1,240 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-/*
- * Copyright (c) 2019, Linaro Limited
- */
-#include "nvmem.h"
-
-static const char * const nvmem_type_str[] = {
-       [NVMEM_TYPE_UNKNOWN] = "Unknown",
-       [NVMEM_TYPE_EEPROM] = "EEPROM",
-       [NVMEM_TYPE_OTP] = "OTP",
-       [NVMEM_TYPE_BATTERY_BACKED] = "Battery backed",
-};
-
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-static struct lock_class_key eeprom_lock_key;
-#endif
-
-static ssize_t type_show(struct device *dev,
-                        struct device_attribute *attr, char *buf)
-{
-       struct nvmem_device *nvmem = to_nvmem_device(dev);
-
-       return sprintf(buf, "%s\n", nvmem_type_str[nvmem->type]);
-}
-
-static DEVICE_ATTR_RO(type);
-
-static struct attribute *nvmem_attrs[] = {
-       &dev_attr_type.attr,
-       NULL,
-};
-
-static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
-                                   struct bin_attribute *attr,
-                                   char *buf, loff_t pos, size_t count)
-{
-       struct device *dev;
-       struct nvmem_device *nvmem;
-       int rc;
-
-       if (attr->private)
-               dev = attr->private;
-       else
-               dev = container_of(kobj, struct device, kobj);
-       nvmem = to_nvmem_device(dev);
-
-       /* Stop the user from reading */
-       if (pos >= nvmem->size)
-               return 0;
-
-       if (count < nvmem->word_size)
-               return -EINVAL;
-
-       if (pos + count > nvmem->size)
-               count = nvmem->size - pos;
-
-       count = round_down(count, nvmem->word_size);
-
-       if (!nvmem->reg_read)
-               return -EPERM;
-
-       rc = nvmem->reg_read(nvmem->priv, pos, buf, count);
-
-       if (rc)
-               return rc;
-
-       return count;
-}
-
-static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
-                                    struct bin_attribute *attr,
-                                    char *buf, loff_t pos, size_t count)
-{
-       struct device *dev;
-       struct nvmem_device *nvmem;
-       int rc;
-
-       if (attr->private)
-               dev = attr->private;
-       else
-               dev = container_of(kobj, struct device, kobj);
-       nvmem = to_nvmem_device(dev);
-
-       /* Stop the user from writing */
-       if (pos >= nvmem->size)
-               return -EFBIG;
-
-       if (count < nvmem->word_size)
-               return -EINVAL;
-
-       if (pos + count > nvmem->size)
-               count = nvmem->size - pos;
-
-       count = round_down(count, nvmem->word_size);
-
-       if (!nvmem->reg_write)
-               return -EPERM;
-
-       rc = nvmem->reg_write(nvmem->priv, pos, buf, count);
-
-       if (rc)
-               return rc;
-
-       return count;
-}
-
-static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
-                                        struct bin_attribute *attr, int i)
-{
-       struct device *dev = container_of(kobj, struct device, kobj);
-       struct nvmem_device *nvmem = to_nvmem_device(dev);
-       umode_t mode = 0400;
-
-       if (!nvmem->root_only)
-               mode |= 0044;
-
-       if (!nvmem->read_only)
-               mode |= 0200;
-
-       if (!nvmem->reg_write)
-               mode &= ~0200;
-
-       if (!nvmem->reg_read)
-               mode &= ~0444;
-
-       return mode;
-}
-
-/* default read/write permissions */
-static struct bin_attribute bin_attr_rw_nvmem = {
-       .attr   = {
-               .name   = "nvmem",
-               .mode   = 0644,
-       },
-       .read   = bin_attr_nvmem_read,
-       .write  = bin_attr_nvmem_write,
-};
-
-static struct bin_attribute *nvmem_bin_attributes[] = {
-       &bin_attr_rw_nvmem,
-       NULL,
-};
-
-static const struct attribute_group nvmem_bin_group = {
-       .bin_attrs      = nvmem_bin_attributes,
-       .attrs          = nvmem_attrs,
-       .is_bin_visible = nvmem_bin_attr_is_visible,
-};
-
-static const struct attribute_group *nvmem_dev_groups[] = {
-       &nvmem_bin_group,
-       NULL,
-};
-
-/* read only permission */
-static struct bin_attribute bin_attr_ro_nvmem = {
-       .attr   = {
-               .name   = "nvmem",
-               .mode   = 0444,
-       },
-       .read   = bin_attr_nvmem_read,
-};
-
-/* default read/write permissions, root only */
-static struct bin_attribute bin_attr_rw_root_nvmem = {
-       .attr   = {
-               .name   = "nvmem",
-               .mode   = 0600,
-       },
-       .read   = bin_attr_nvmem_read,
-       .write  = bin_attr_nvmem_write,
-};
-
-/* read only permission, root only */
-static struct bin_attribute bin_attr_ro_root_nvmem = {
-       .attr   = {
-               .name   = "nvmem",
-               .mode   = 0400,
-       },
-       .read   = bin_attr_nvmem_read,
-};
-
-const struct attribute_group **nvmem_sysfs_get_groups(void)
-{
-       return nvmem_dev_groups;
-}
-
-/*
- * nvmem_setup_compat() - Create an additional binary entry in
- * drivers sys directory, to be backwards compatible with the older
- * drivers/misc/eeprom drivers.
- */
-int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
-                             const struct nvmem_config *config)
-{
-       int rval;
-
-       if (!config->compat)
-               return 0;
-
-       if (!config->base_dev)
-               return -EINVAL;
-
-       if (nvmem->read_only) {
-               if (config->root_only)
-                       nvmem->eeprom = bin_attr_ro_root_nvmem;
-               else
-                       nvmem->eeprom = bin_attr_ro_nvmem;
-       } else {
-               if (config->root_only)
-                       nvmem->eeprom = bin_attr_rw_root_nvmem;
-               else
-                       nvmem->eeprom = bin_attr_rw_nvmem;
-       }
-       nvmem->eeprom.attr.name = "eeprom";
-       nvmem->eeprom.size = nvmem->size;
-#ifdef CONFIG_DEBUG_LOCK_ALLOC
-       nvmem->eeprom.attr.key = &eeprom_lock_key;
-#endif
-       nvmem->eeprom.private = &nvmem->dev;
-       nvmem->base_dev = config->base_dev;
-
-       rval = device_create_bin_file(nvmem->base_dev, &nvmem->eeprom);
-       if (rval) {
-               dev_err(&nvmem->dev,
-                       "Failed to create eeprom binary file %d\n", rval);
-               return rval;
-       }
-
-       nvmem->flags |= FLAG_COMPAT;
-
-       return 0;
-}
-
-void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,
-                             const struct nvmem_config *config)
-{
-       if (config->compat)
-               device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
-}
diff --git a/drivers/nvmem/nvmem.h b/drivers/nvmem/nvmem.h
deleted file mode 100644 (file)
index 478b796..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-#ifndef _DRIVERS_NVMEM_H
-#define _DRIVERS_NVMEM_H
-
-#include <linux/device.h>
-#include <linux/fs.h>
-#include <linux/kref.h>
-#include <linux/list.h>
-#include <linux/nvmem-consumer.h>
-#include <linux/nvmem-provider.h>
-#include <linux/gpio/consumer.h>
-
-struct nvmem_device {
-       struct module           *owner;
-       struct device           dev;
-       int                     stride;
-       int                     word_size;
-       int                     id;
-       struct kref             refcnt;
-       size_t                  size;
-       bool                    read_only;
-       bool                    root_only;
-       int                     flags;
-       enum nvmem_type         type;
-       struct bin_attribute    eeprom;
-       struct device           *base_dev;
-       struct list_head        cells;
-       nvmem_reg_read_t        reg_read;
-       nvmem_reg_write_t       reg_write;
-       struct gpio_desc        *wp_gpio;
-       void *priv;
-};
-
-#define to_nvmem_device(d) container_of(d, struct nvmem_device, dev)
-#define FLAG_COMPAT            BIT(0)
-
-#ifdef CONFIG_NVMEM_SYSFS
-const struct attribute_group **nvmem_sysfs_get_groups(void);
-int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
-                             const struct nvmem_config *config);
-void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,
-                             const struct nvmem_config *config);
-#else
-static inline const struct attribute_group **nvmem_sysfs_get_groups(void)
-{
-       return NULL;
-}
-
-static inline int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
-                                     const struct nvmem_config *config)
-{
-       return -ENOSYS;
-}
-static inline void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,
-                             const struct nvmem_config *config)
-{
-}
-#endif /* CONFIG_NVMEM_SYSFS */
-
-#endif /* _DRIVERS_NVMEM_H */