Merge tag 'char-misc-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / nvmem / core.c

diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c
index 05c6ae4..927eb5f 100644 (file)
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
@@ -66,6 +66,30 @@ static LIST_HEAD(nvmem_lookup_list);
 
 static BLOCKING_NOTIFIER_HEAD(nvmem_notifier);
 
+static int nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
+                         void *val, size_t bytes)
+{
+       if (nvmem->reg_read)
+               return nvmem->reg_read(nvmem->priv, offset, val, bytes);
+
+       return -EINVAL;
+}
+
+static int nvmem_reg_write(struct nvmem_device *nvmem, unsigned int offset,
+                          void *val, size_t bytes)
+{
+       int ret;
+
+       if (nvmem->reg_write) {
+               gpiod_set_value_cansleep(nvmem->wp_gpio, 0);
+               ret = nvmem->reg_write(nvmem->priv, offset, val, bytes);
+               gpiod_set_value_cansleep(nvmem->wp_gpio, 1);
+               return ret;
+       }
+
+       return -EINVAL;
+}
+
 #ifdef CONFIG_NVMEM_SYSFS
 static const char * const nvmem_type_str[] = {
        [NVMEM_TYPE_UNKNOWN] = "Unknown",
@@ -122,7 +146,7 @@ static ssize_t bin_attr_nvmem_read(struct file *filp, struct kobject *kobj,
        if (!nvmem->reg_read)
                return -EPERM;
 
-       rc = nvmem->reg_read(nvmem->priv, pos, buf, count);
+       rc = nvmem_reg_read(nvmem, pos, buf, count);
 
        if (rc)
                return rc;
@@ -159,7 +183,7 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
        if (!nvmem->reg_write)
                return -EPERM;
 
-       rc = nvmem->reg_write(nvmem->priv, pos, buf, count);
+       rc = nvmem_reg_write(nvmem, pos, buf, count);
 
        if (rc)
                return rc;
@@ -167,11 +191,8 @@ static ssize_t bin_attr_nvmem_write(struct file *filp, struct kobject *kobj,
        return count;
 }
 
-static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
-                                        struct bin_attribute *attr, int i)
+static umode_t nvmem_bin_attr_get_umode(struct nvmem_device *nvmem)
 {
-       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)
@@ -189,6 +210,15 @@ static umode_t nvmem_bin_attr_is_visible(struct kobject *kobj,
        return mode;
 }
 
+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);
+
+       return nvmem_bin_attr_get_umode(nvmem);
+}
+
 /* default read/write permissions */
 static struct bin_attribute bin_attr_rw_nvmem = {
        .attr   = {
@@ -215,34 +245,14 @@ static const struct attribute_group *nvmem_dev_groups[] = {
        NULL,
 };
 
-/* read only permission */
-static struct bin_attribute bin_attr_ro_nvmem = {
+static struct bin_attribute bin_attr_nvmem_eeprom_compat = {
        .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,
+               .name   = "eeprom",
        },
        .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
@@ -259,18 +269,8 @@ static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
        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 = bin_attr_nvmem_eeprom_compat;
+       nvmem->eeprom.attr.mode = nvmem_bin_attr_get_umode(nvmem);
        nvmem->eeprom.size = nvmem->size;
 #ifdef CONFIG_DEBUG_LOCK_ALLOC
        nvmem->eeprom.attr.key = &eeprom_lock_key;
@@ -311,30 +311,6 @@ static void nvmem_sysfs_remove_compat(struct nvmem_device *nvmem,
 
 #endif /* CONFIG_NVMEM_SYSFS */
 
-static int nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
-                         void *val, size_t bytes)
-{
-       if (nvmem->reg_read)
-               return nvmem->reg_read(nvmem->priv, offset, val, bytes);
-
-       return -EINVAL;
-}
-
-static int nvmem_reg_write(struct nvmem_device *nvmem, unsigned int offset,
-                          void *val, size_t bytes)
-{
-       int ret;
-
-       if (nvmem->reg_write) {
-               gpiod_set_value_cansleep(nvmem->wp_gpio, 0);
-               ret = nvmem->reg_write(nvmem->priv, offset, val, bytes);
-               gpiod_set_value_cansleep(nvmem->wp_gpio, 1);
-               return ret;
-       }
-
-       return -EINVAL;
-}
-
 static void nvmem_release(struct device *dev)
 {
        struct nvmem_device *nvmem = to_nvmem_device(dev);