iio: Use octal permissions and DEVICE_ATTR_{RO,RW}.

As reported by checkpatch.pl.  Where possible use DEVICE_ATTR_RO(),
DEVICE_ATTR_RW(), and __ATTR_RO().  Change function names to be
<var>_show() for read and <var>_store() for write.

Suggested-by: Joe Perches <joe@perches.com>
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Joe Simmons-Talbott <joetalbott@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220601185414.251571-1-joetalbott@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 06141ca27e1ffc0aba1fab4321d16194a60c80df..3d2b7712a8e6e43198d665d19d96a4b0ccc7d201 100644 (file)
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -630,18 +630,16 @@ static int iio_buffer_add_channel_sysfs(struct iio_dev *indio_dev,
        return ret;
 }
 
-static ssize_t iio_buffer_read_length(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+static ssize_t length_show(struct device *dev, struct device_attribute *attr,
+                          char *buf)
 {
        struct iio_buffer *buffer = to_iio_dev_attr(attr)->buffer;
 
        return sysfs_emit(buf, "%d\n", buffer->length);
 }
 
-static ssize_t iio_buffer_write_length(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf, size_t len)
+static ssize_t length_store(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t len)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct iio_buffer *buffer = to_iio_dev_attr(attr)->buffer;
@@ -672,9 +670,8 @@ out:
        return ret ? ret : len;
 }
 
-static ssize_t iio_buffer_show_enable(struct device *dev,
-                                     struct device_attribute *attr,
-                                     char *buf)
+static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
+                          char *buf)
 {
        struct iio_buffer *buffer = to_iio_dev_attr(attr)->buffer;
 
@@ -1292,10 +1289,8 @@ void iio_disable_all_buffers(struct iio_dev *indio_dev)
        iio_buffer_deactivate_all(indio_dev);
 }
 
-static ssize_t iio_buffer_store_enable(struct device *dev,
-                                      struct device_attribute *attr,
-                                      const char *buf,
-                                      size_t len)
+static ssize_t enable_store(struct device *dev, struct device_attribute *attr,
+                           const char *buf, size_t len)
 {
        int ret;
        bool requested_state;
@@ -1325,19 +1320,17 @@ done:
        return (ret < 0) ? ret : len;
 }
 
-static ssize_t iio_buffer_show_watermark(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
+static ssize_t watermark_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
 {
        struct iio_buffer *buffer = to_iio_dev_attr(attr)->buffer;
 
        return sysfs_emit(buf, "%u\n", buffer->watermark);
 }
 
-static ssize_t iio_buffer_store_watermark(struct device *dev,
-                                         struct device_attribute *attr,
-                                         const char *buf,
-                                         size_t len)
+static ssize_t watermark_store(struct device *dev,
+                              struct device_attribute *attr,
+                              const char *buf, size_t len)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct iio_buffer *buffer = to_iio_dev_attr(attr)->buffer;
@@ -1369,9 +1362,8 @@ out:
        return ret ? ret : len;
 }
 
-static ssize_t iio_dma_show_data_available(struct device *dev,
-                                               struct device_attribute *attr,
-                                               char *buf)
+static ssize_t data_available_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
 {
        struct iio_buffer *buffer = to_iio_dev_attr(attr)->buffer;
 
@@ -1394,18 +1386,12 @@ static ssize_t direction_show(struct device *dev,
        }
 }
 
-static DEVICE_ATTR(length, S_IRUGO | S_IWUSR, iio_buffer_read_length,
-                  iio_buffer_write_length);
-static struct device_attribute dev_attr_length_ro = __ATTR(length,
-       S_IRUGO, iio_buffer_read_length, NULL);
-static DEVICE_ATTR(enable, S_IRUGO | S_IWUSR,
-                  iio_buffer_show_enable, iio_buffer_store_enable);
-static DEVICE_ATTR(watermark, S_IRUGO | S_IWUSR,
-                  iio_buffer_show_watermark, iio_buffer_store_watermark);
-static struct device_attribute dev_attr_watermark_ro = __ATTR(watermark,
-       S_IRUGO, iio_buffer_show_watermark, NULL);
-static DEVICE_ATTR(data_available, S_IRUGO,
-               iio_dma_show_data_available, NULL);
+static DEVICE_ATTR_RW(length);
+static struct device_attribute dev_attr_length_ro = __ATTR_RO(length);
+static DEVICE_ATTR_RW(enable);
+static DEVICE_ATTR_RW(watermark);
+static struct device_attribute dev_attr_watermark_ro = __ATTR_RO(watermark);
+static DEVICE_ATTR_RO(data_available);
 static DEVICE_ATTR_RO(direction);
 
 /*

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 0703c8c7c180c5f6b06c6ccd80d5520b0eb35d46..dc3e1cb9bfbd18439cbc136b1e0d166882f5add1 100644 (file)
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -1104,12 +1104,12 @@ int __iio_device_attr_init(struct device_attribute *dev_attr,
        dev_attr->attr.name = name;
 
        if (readfunc) {
-               dev_attr->attr.mode |= S_IRUGO;
+               dev_attr->attr.mode |= 0444;
                dev_attr->show = readfunc;
        }
 
        if (writefunc) {
-               dev_attr->attr.mode |= S_IWUSR;
+               dev_attr->attr.mode |= 0200;
                dev_attr->store = writefunc;
        }
 
@@ -1383,29 +1383,27 @@ void iio_free_chan_devattr_list(struct list_head *attr_list)
        }
 }
 
-static ssize_t iio_show_dev_name(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
+static ssize_t name_show(struct device *dev, struct device_attribute *attr,
+                        char *buf)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        return sysfs_emit(buf, "%s\n", indio_dev->name);
 }
 
-static DEVICE_ATTR(name, S_IRUGO, iio_show_dev_name, NULL);
+static DEVICE_ATTR_RO(name);
 
-static ssize_t iio_show_dev_label(struct device *dev,
-                                struct device_attribute *attr,
-                                char *buf)
+static ssize_t label_show(struct device *dev, struct device_attribute *attr,
+                         char *buf)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        return sysfs_emit(buf, "%s\n", indio_dev->label);
 }
 
-static DEVICE_ATTR(label, S_IRUGO, iio_show_dev_label, NULL);
+static DEVICE_ATTR_RO(label);
 
-static ssize_t iio_show_timestamp_clock(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t current_timestamp_clock_show(struct device *dev,
+                                           struct device_attribute *attr,
+                                           char *buf)
 {
        const struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        const clockid_t clk = iio_device_get_clock(indio_dev);
@@ -1449,9 +1447,9 @@ static ssize_t iio_show_timestamp_clock(struct device *dev,
        return sz;
 }
 
-static ssize_t iio_store_timestamp_clock(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t len)
+static ssize_t current_timestamp_clock_store(struct device *dev,
+                                            struct device_attribute *attr,
+                                            const char *buf, size_t len)
 {
        clockid_t clk;
        int ret;
@@ -1499,8 +1497,7 @@ int iio_device_register_sysfs_group(struct iio_dev *indio_dev,
        return 0;
 }
 
-static DEVICE_ATTR(current_timestamp_clock, S_IRUGO | S_IWUSR,
-                  iio_show_timestamp_clock, iio_store_timestamp_clock);
+static DEVICE_ATTR_RW(current_timestamp_clock);
 
 static int iio_device_register_sysfs(struct iio_dev *indio_dev)
 {

diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 1e43e93b581693f31796702cab3bc907d1f85155..d89bf90650d5aecc118f52f699adabaedba7337f 100644 (file)
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -37,7 +37,7 @@ static LIST_HEAD(iio_trigger_list);
 static DEFINE_MUTEX(iio_trigger_list_lock);
 
 /**
- * iio_trigger_read_name() - retrieve useful identifying name
+ * name_show() - retrieve useful identifying name
  * @dev:       device associated with the iio_trigger
  * @attr:      pointer to the device_attribute structure that is
  *             being processed
@@ -46,15 +46,14 @@ static DEFINE_MUTEX(iio_trigger_list_lock);
  * Return: a negative number on failure or the number of written
  *        characters on success.
  */
-static ssize_t iio_trigger_read_name(struct device *dev,
-                                    struct device_attribute *attr,
-                                    char *buf)
+static ssize_t name_show(struct device *dev, struct device_attribute *attr,
+                        char *buf)
 {
        struct iio_trigger *trig = to_iio_trigger(dev);
        return sysfs_emit(buf, "%s\n", trig->name);
 }
 
-static DEVICE_ATTR(name, S_IRUGO, iio_trigger_read_name, NULL);
+static DEVICE_ATTR_RO(name);
 
 static struct attribute *iio_trig_dev_attrs[] = {
        &dev_attr_name.attr,
@@ -395,7 +394,7 @@ void iio_dealloc_pollfunc(struct iio_poll_func *pf)
 EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc);
 
 /**
- * iio_trigger_read_current() - trigger consumer sysfs query current trigger
+ * current_trigger_show() - trigger consumer sysfs query current trigger
  * @dev:       device associated with an industrial I/O device
  * @attr:      pointer to the device_attribute structure that
  *             is being processed
@@ -407,9 +406,8 @@ EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc);
  * Return: a negative number on failure, the number of characters written
  *        on success or 0 if no trigger is available
  */
-static ssize_t iio_trigger_read_current(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t current_trigger_show(struct device *dev,
+                                   struct device_attribute *attr, char *buf)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 
@@ -419,7 +417,7 @@ static ssize_t iio_trigger_read_current(struct device *dev,
 }
 
 /**
- * iio_trigger_write_current() - trigger consumer sysfs set current trigger
+ * current_trigger_store() - trigger consumer sysfs set current trigger
  * @dev:       device associated with an industrial I/O device
  * @attr:      device attribute that is being processed
  * @buf:       string buffer that holds the name of the trigger
@@ -432,10 +430,9 @@ static ssize_t iio_trigger_read_current(struct device *dev,
  * Return: negative error code on failure or length of the buffer
  *        on success
  */
-static ssize_t iio_trigger_write_current(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf,
-                                        size_t len)
+static ssize_t current_trigger_store(struct device *dev,
+                                    struct device_attribute *attr,
+                                    const char *buf, size_t len)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev);
@@ -494,9 +491,7 @@ out_trigger_put:
        return ret;
 }
 
-static DEVICE_ATTR(current_trigger, S_IRUGO | S_IWUSR,
-                  iio_trigger_read_current,
-                  iio_trigger_write_current);
+static DEVICE_ATTR_RW(current_trigger);
 
 static struct attribute *iio_trigger_consumer_attrs[] = {
        &dev_attr_current_trigger.attr,