staging:iio:light: Use dev_to_iio_dev()

Replace open-coded instances of getting a iio_dev struct from a device struct
with dev_to_iio_dev().

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 2d23c6afa2864c4f2297d6271fc7591e07d2512c..0abbf18d6103a891d57b8b9e5d7bdff6f95ed7d9 100644 (file)
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -214,7 +214,7 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
 static ssize_t show_range(struct device *dev,
                        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct isl29018_chip *chip = iio_priv(indio_dev);
 
        return sprintf(buf, "%u\n", chip->range);
@@ -223,7 +223,7 @@ static ssize_t show_range(struct device *dev,
 static ssize_t store_range(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t count)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct isl29018_chip *chip = iio_priv(indio_dev);
        int status;
        unsigned long lval;
@@ -256,7 +256,7 @@ static ssize_t store_range(struct device *dev,
 static ssize_t show_resolution(struct device *dev,
                        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct isl29018_chip *chip = iio_priv(indio_dev);
 
        return sprintf(buf, "%u\n", chip->adc_bit);
@@ -265,7 +265,7 @@ static ssize_t show_resolution(struct device *dev,
 static ssize_t store_resolution(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t count)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct isl29018_chip *chip = iio_priv(indio_dev);
        int status;
        unsigned long lval;
@@ -295,7 +295,7 @@ static ssize_t store_resolution(struct device *dev,
 static ssize_t show_prox_infrared_supression(struct device *dev,
                        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct isl29018_chip *chip = iio_priv(indio_dev);
 
        /* return the "proximity scheme" i.e. if the chip does on chip
@@ -306,7 +306,7 @@ static ssize_t show_prox_infrared_supression(struct device *dev,
 static ssize_t store_prox_infrared_supression(struct device *dev,
                struct device_attribute *attr, const char *buf, size_t count)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct isl29018_chip *chip = iio_priv(indio_dev);
        unsigned long lval;
 

diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 5ff391e8c18be61db1610cc53ca3fa071531412e..5e23ad5a30d5dbe302834c10961ca37e89b732eb 100644 (file)
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -483,7 +483,7 @@ static int taos_chip_off(struct iio_dev *indio_dev)
 static ssize_t taos_power_state_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
 
        return sprintf(buf, "%d\n", chip->taos_chip_status);
@@ -492,7 +492,7 @@ static ssize_t taos_power_state_show(struct device *dev,
 static ssize_t taos_power_state_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        unsigned long value;
 
        if (strict_strtoul(buf, 0, &value))
@@ -509,7 +509,7 @@ static ssize_t taos_power_state_store(struct device *dev,
 static ssize_t taos_gain_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
        char gain[4] = {0};
 
@@ -534,7 +534,7 @@ static ssize_t taos_gain_show(struct device *dev,
 static ssize_t taos_gain_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
        unsigned long value;
 
@@ -571,7 +571,7 @@ static ssize_t taos_gain_available_show(struct device *dev,
 static ssize_t taos_als_time_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
 
        return sprintf(buf, "%d\n", chip->taos_settings.als_time);
@@ -580,7 +580,7 @@ static ssize_t taos_als_time_show(struct device *dev,
 static ssize_t taos_als_time_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
        unsigned long value;
 
@@ -608,7 +608,7 @@ static ssize_t taos_als_time_available_show(struct device *dev,
 static ssize_t taos_als_trim_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
 
        return sprintf(buf, "%d\n", chip->taos_settings.als_gain_trim);
@@ -617,7 +617,7 @@ static ssize_t taos_als_trim_show(struct device *dev,
 static ssize_t taos_als_trim_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
        unsigned long value;
 
@@ -633,7 +633,7 @@ static ssize_t taos_als_trim_store(struct device *dev,
 static ssize_t taos_als_cal_target_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
 
        return sprintf(buf, "%d\n", chip->taos_settings.als_cal_target);
@@ -642,7 +642,7 @@ static ssize_t taos_als_cal_target_show(struct device *dev,
 static ssize_t taos_als_cal_target_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
        unsigned long value;
 
@@ -660,7 +660,7 @@ static ssize_t taos_lux_show(struct device *dev, struct device_attribute *attr,
 {
        int ret;
 
-       ret = taos_get_lux(dev_get_drvdata(dev));
+       ret = taos_get_lux(dev_to_iio_dev(dev));
        if (ret < 0)
                return ret;
 
@@ -670,7 +670,7 @@ static ssize_t taos_lux_show(struct device *dev, struct device_attribute *attr,
 static ssize_t taos_do_calibrate(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        unsigned long value;
 
        if (strict_strtoul(buf, 0, &value))
@@ -708,7 +708,7 @@ static ssize_t taos_luxtable_show(struct device *dev,
 static ssize_t taos_luxtable_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct tsl2583_chip *chip = iio_priv(indio_dev);
        int value[ARRAY_SIZE(taos_device_lux)*3 + 1];
        int n;

diff --git a/drivers/staging/iio/light/tsl2x7x_core.c b/drivers/staging/iio/light/tsl2x7x_core.c
index efbc4d27e79455d3fd3dc4cf8b4eaeff493f44de..c3b05a1b3ea843241ff99172fdb04b336e544511 100755 (executable)
--- a/drivers/staging/iio/light/tsl2x7x_core.c
+++ b/drivers/staging/iio/light/tsl2x7x_core.c
@@ -971,7 +971,7 @@ static void tsl2x7x_prox_cal(struct iio_dev *indio_dev)
 static ssize_t tsl2x7x_power_state_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
 
        return snprintf(buf, PAGE_SIZE, "%d\n", chip->tsl2x7x_chip_status);
 }
@@ -979,7 +979,7 @@ static ssize_t tsl2x7x_power_state_show(struct device *dev,
 static ssize_t tsl2x7x_power_state_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        bool value;
 
        if (strtobool(buf, &value))
@@ -996,7 +996,7 @@ static ssize_t tsl2x7x_power_state_store(struct device *dev,
 static ssize_t tsl2x7x_gain_available_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
 
        switch (chip->id) {
        case tsl2571:
@@ -1020,7 +1020,7 @@ static ssize_t tsl2x7x_prox_gain_available_show(struct device *dev,
 static ssize_t tsl2x7x_als_time_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
        int y, z;
 
        y = (TSL2X7X_MAX_TIMER_CNT - (u8)chip->tsl2x7x_settings.als_time) + 1;
@@ -1034,8 +1034,8 @@ static ssize_t tsl2x7x_als_time_show(struct device *dev,
 static ssize_t tsl2x7x_als_time_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+       struct tsl2X7X_chip *chip = iio_priv(indio_dev);
        struct tsl2x7x_parse_result result;
 
        result.integer = 0;
@@ -1062,7 +1062,7 @@ static IIO_CONST_ATTR(in_illuminance0_integration_time_available,
 static ssize_t tsl2x7x_als_cal_target_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
 
        return snprintf(buf, PAGE_SIZE, "%d\n",
                        chip->tsl2x7x_settings.als_cal_target);
@@ -1071,8 +1071,8 @@ static ssize_t tsl2x7x_als_cal_target_show(struct device *dev,
 static ssize_t tsl2x7x_als_cal_target_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+       struct tsl2X7X_chip *chip = iio_priv(indio_dev);
        unsigned long value;
 
        if (kstrtoul(buf, 0, &value))
@@ -1090,7 +1090,7 @@ static ssize_t tsl2x7x_als_cal_target_store(struct device *dev,
 static ssize_t tsl2x7x_als_persistence_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
        int y, z, filter_delay;
 
        /* Determine integration time */
@@ -1106,8 +1106,8 @@ static ssize_t tsl2x7x_als_persistence_show(struct device *dev,
 static ssize_t tsl2x7x_als_persistence_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+       struct tsl2X7X_chip *chip = iio_priv(indio_dev);
        struct tsl2x7x_parse_result result;
        int y, z, filter_delay;
 
@@ -1136,7 +1136,7 @@ static ssize_t tsl2x7x_als_persistence_store(struct device *dev,
 static ssize_t tsl2x7x_prox_persistence_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
        int y, z, filter_delay;
 
        /* Determine integration time */
@@ -1152,8 +1152,8 @@ static ssize_t tsl2x7x_prox_persistence_show(struct device *dev,
 static ssize_t tsl2x7x_prox_persistence_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+       struct tsl2X7X_chip *chip = iio_priv(indio_dev);
        struct tsl2x7x_parse_result result;
        int y, z, filter_delay;
 
@@ -1182,7 +1182,7 @@ static ssize_t tsl2x7x_prox_persistence_store(struct device *dev,
 static ssize_t tsl2x7x_do_calibrate(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        bool value;
 
        if (strtobool(buf, &value))
@@ -1199,7 +1199,7 @@ static ssize_t tsl2x7x_do_calibrate(struct device *dev,
 static ssize_t tsl2x7x_luxtable_show(struct device *dev,
        struct device_attribute *attr, char *buf)
 {
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct tsl2X7X_chip *chip = iio_priv(dev_to_iio_dev(dev));
        int i = 0;
        int offset = 0;
 
@@ -1224,8 +1224,8 @@ static ssize_t tsl2x7x_luxtable_show(struct device *dev,
 static ssize_t tsl2x7x_luxtable_store(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct tsl2X7X_chip *chip = iio_priv(dev_get_drvdata(dev));
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+       struct tsl2X7X_chip *chip = iio_priv(indio_dev);
        int value[ARRAY_SIZE(chip->tsl2x7x_device_lux)*3 + 1];
        int n;
 
@@ -1263,7 +1263,7 @@ static ssize_t tsl2x7x_luxtable_store(struct device *dev,
 static ssize_t tsl2x7x_do_prox_calibrate(struct device *dev,
        struct device_attribute *attr, const char *buf, size_t len)
 {
-       struct iio_dev *indio_dev = dev_get_drvdata(dev);
+       struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        bool value;
 
        if (strtobool(buf, &value))