staging: iio: tsl2583: use IIO_*_ATTR* macros to create sysfs entries

Use the IIO_CONST_ATTR, IIO_DEVICE_ATTR_RW, and IIO_DEVICE_ATTR_WO
macros for creating the in_illuminance_calibscale_available,
in_illuminance_integration_time_available, in_illuminance_input_target,
in_illuminance_calibrate, and in_illuminance_lux_table sysfs entries.
Previously these sysfs entries were prefixed with illuminance0_, however
they are now prefixed with in_illuminance_ to make these sysfs entries
consistent with how the IIO core is creating the other sysfs entries.

Signed-off-by: Brian Masney <masneyb@onstation.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index bfff6ca..1462374 100644 (file)
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -29,6 +29,7 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
 
 #define TSL258X_MAX_DEVICE_REGS                32
 
@@ -506,24 +507,9 @@ static int taos_chip_off(struct iio_dev *indio_dev)
 
 /* Sysfs Interface Functions */
 
-static ssize_t taos_gain_available_show(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
-{
-       return sprintf(buf, "%s\n", "1 8 16 111");
-}
-
-static ssize_t taos_als_time_available_show(struct device *dev,
-                                           struct device_attribute *attr,
-                                           char *buf)
-{
-       return sprintf(buf, "%s\n",
-               "0.000050 0.000100 0.000150 0.000200 0.000250 0.000300 0.000350 0.000400 0.000450 0.000500 0.000550 0.000600 0.000650");
-}
-
-static ssize_t taos_als_cal_target_show(struct device *dev,
-                                       struct device_attribute *attr,
-                                       char *buf)
+static ssize_t in_illuminance_input_target_show(struct device *dev,
+                                               struct device_attribute *attr,
+                                               char *buf)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
@@ -531,9 +517,9 @@ static ssize_t taos_als_cal_target_show(struct device *dev,
        return sprintf(buf, "%d\n", chip->taos_settings.als_cal_target);
 }
 
-static ssize_t taos_als_cal_target_store(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t len)
+static ssize_t in_illuminance_input_target_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 tsl2583_chip *chip = iio_priv(indio_dev);
@@ -548,9 +534,9 @@ static ssize_t taos_als_cal_target_store(struct device *dev,
        return len;
 }
 
-static ssize_t taos_do_calibrate(struct device *dev,
-                                struct device_attribute *attr,
-                                const char *buf, size_t len)
+static ssize_t in_illuminance_calibrate_store(struct device *dev,
+                                             struct device_attribute *attr,
+                                             const char *buf, size_t len)
 {
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        int value;
@@ -564,8 +550,9 @@ static ssize_t taos_do_calibrate(struct device *dev,
        return len;
 }
 
-static ssize_t taos_luxtable_show(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
+static ssize_t in_illuminance_lux_table_show(struct device *dev,
+                                            struct device_attribute *attr,
+                                            char *buf)
 {
        int i;
        int offset = 0;
@@ -589,9 +576,9 @@ static ssize_t taos_luxtable_show(struct device *dev,
        return offset;
 }
 
-static ssize_t taos_luxtable_store(struct device *dev,
-                                  struct device_attribute *attr,
-                                  const char *buf, size_t len)
+static ssize_t in_illuminance_lux_table_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 tsl2583_chip *chip = iio_priv(indio_dev);
@@ -635,25 +622,19 @@ done:
        return ret;
 }
 
-static DEVICE_ATTR(illuminance0_calibscale_available, S_IRUGO,
-               taos_gain_available_show, NULL);
-
-static DEVICE_ATTR(illuminance0_integration_time_available, S_IRUGO,
-               taos_als_time_available_show, NULL);
-
-static DEVICE_ATTR(illuminance0_input_target, S_IRUGO | S_IWUSR,
-               taos_als_cal_target_show, taos_als_cal_target_store);
-
-static DEVICE_ATTR(illuminance0_calibrate, S_IWUSR, NULL, taos_do_calibrate);
-static DEVICE_ATTR(illuminance0_lux_table, S_IRUGO | S_IWUSR,
-               taos_luxtable_show, taos_luxtable_store);
+static IIO_CONST_ATTR(in_illuminance_calibscale_available, "1 8 16 111");
+static IIO_CONST_ATTR(in_illuminance_integration_time_available,
+                     "0.000050 0.000100 0.000150 0.000200 0.000250 0.000300 0.000350 0.000400 0.000450 0.000500 0.000550 0.000600 0.000650");
+static IIO_DEVICE_ATTR_RW(in_illuminance_input_target, 0);
+static IIO_DEVICE_ATTR_WO(in_illuminance_calibrate, 0);
+static IIO_DEVICE_ATTR_RW(in_illuminance_lux_table, 0);
 
 static struct attribute *sysfs_attrs_ctrl[] = {
-       &dev_attr_illuminance0_calibscale_available.attr,
-       &dev_attr_illuminance0_integration_time_available.attr,
-       &dev_attr_illuminance0_input_target.attr,
-       &dev_attr_illuminance0_calibrate.attr,
-       &dev_attr_illuminance0_lux_table.attr,
+       &iio_const_attr_in_illuminance_calibscale_available.dev_attr.attr,
+       &iio_const_attr_in_illuminance_integration_time_available.dev_attr.attr,
+       &iio_dev_attr_in_illuminance_input_target.dev_attr.attr,
+       &iio_dev_attr_in_illuminance_calibrate.dev_attr.attr,
+       &iio_dev_attr_in_illuminance_lux_table.dev_attr.attr,
        NULL
 };