mfd: intel_soc_pmic_bxtwc: Use DEVICE_ATTR_ADMIN_RW macro

Use DEVICE_ATTR_ADMIN_RW macro helper instead of plain DEVICE_ATTR, which
makes the code a bit shorter and easier to read.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
index 47d0d3a69a58a372f4f926925526dc399cf46743..bc069c4daa60393a531f6e0e0e07f7553036a326 100644 (file)
--- a/drivers/mfd/intel_soc_pmic_bxtwc.c
+++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
@@ -330,14 +330,14 @@ static int regmap_ipc_byte_reg_write(void *context, unsigned int reg,
 
 /* sysfs interfaces to r/w PMIC registers, required by initial script */
 static unsigned long bxtwc_reg_addr;
-static ssize_t bxtwc_reg_show(struct device *dev,
-               struct device_attribute *attr, char *buf)
+static ssize_t addr_show(struct device *dev,
+                        struct device_attribute *attr, char *buf)
 {
        return sprintf(buf, "0x%lx\n", bxtwc_reg_addr);
 }
 
-static ssize_t bxtwc_reg_store(struct device *dev,
-       struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t addr_store(struct device *dev,
+                         struct device_attribute *attr, const char *buf, size_t count)
 {
        if (kstrtoul(buf, 0, &bxtwc_reg_addr)) {
                dev_err(dev, "Invalid register address\n");
@@ -346,8 +346,8 @@ static ssize_t bxtwc_reg_store(struct device *dev,
        return (ssize_t)count;
 }
 
-static ssize_t bxtwc_val_show(struct device *dev,
-               struct device_attribute *attr, char *buf)
+static ssize_t val_show(struct device *dev,
+                       struct device_attribute *attr, char *buf)
 {
        int ret;
        unsigned int val;
@@ -362,8 +362,8 @@ static ssize_t bxtwc_val_show(struct device *dev,
        return sprintf(buf, "0x%02x\n", val);
 }
 
-static ssize_t bxtwc_val_store(struct device *dev,
-       struct device_attribute *attr, const char *buf, size_t count)
+static ssize_t val_store(struct device *dev,
+                        struct device_attribute *attr, const char *buf, size_t count)
 {
        int ret;
        unsigned int val;
@@ -382,8 +382,8 @@ static ssize_t bxtwc_val_store(struct device *dev,
        return count;
 }
 
-static DEVICE_ATTR(addr, S_IWUSR | S_IRUSR, bxtwc_reg_show, bxtwc_reg_store);
-static DEVICE_ATTR(val, S_IWUSR | S_IRUSR, bxtwc_val_show, bxtwc_val_store);
+static DEVICE_ATTR_ADMIN_RW(addr);
+static DEVICE_ATTR_ADMIN_RW(val);
 static struct attribute *bxtwc_attrs[] = {
        &dev_attr_addr.attr,
        &dev_attr_val.attr,