iio: 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>

4 files changed, 20 insertions, 20 deletions

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index b5b2c38045c5..ac185b8694bd 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -105,7 +105,7 @@ static ssize_t iio_scan_el_show(struct device *dev,
                                 char *buf)
 {
         int ret;
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 
         ret = test_bit(to_iio_dev_attr(attr)->address,
                        indio_dev->buffer->scan_mask);
@@ -126,7 +126,7 @@ static ssize_t iio_scan_el_store(struct device *dev,
 {
         int ret;
         bool state;
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_buffer *buffer = indio_dev->buffer;
         struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
 
@@ -162,7 +162,7 @@ static ssize_t iio_scan_el_ts_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);
         return sprintf(buf, "%d\n", indio_dev->buffer->scan_timestamp);
 }
 
@@ -172,7 +172,7 @@ static ssize_t iio_scan_el_ts_store(struct device *dev,
                                     size_t len)
 {
         int ret;
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         bool state;
 
         ret = strtobool(buf, &state);
@@ -352,7 +352,7 @@ ssize_t iio_buffer_read_length(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 iio_buffer *buffer = indio_dev->buffer;
 
         if (buffer->access->get_length)
@@ -370,7 +370,7 @@ ssize_t iio_buffer_write_length(struct device *dev,
 {
         int ret;
         ulong val;
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_buffer *buffer = indio_dev->buffer;
 
         ret = strict_strtoul(buf, 10, &val);
@@ -403,7 +403,7 @@ ssize_t iio_buffer_store_enable(struct device *dev,
         int ret;
         bool requested_state, current_state;
         int previous_mode;
-        struct iio_dev *indio_dev = dev_get_drvdata(dev);
+        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
         struct iio_buffer *buffer = indio_dev->buffer;
 
         mutex_lock(&indio_dev->mlock);
@@ -489,7 +489,7 @@ ssize_t iio_buffer_show_enable(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);
         return sprintf(buf, "%d\n", iio_buffer_enabled(indio_dev));
 }
 EXPORT_SYMBOL(iio_buffer_show_enable);
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 86f34600a3aa..1ddd8861c71b 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -265,7 +265,7 @@ static ssize_t iio_read_channel_ext_info(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         const struct iio_chan_spec_ext_info *ext_info;
 
@@ -279,7 +279,7 @@ static ssize_t iio_write_channel_ext_info(struct device *dev,
                                      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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         const struct iio_chan_spec_ext_info *ext_info;
 
@@ -293,7 +293,7 @@ static ssize_t iio_read_channel_info(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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int val, val2;
         bool scale_db = false;
@@ -330,7 +330,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
                                       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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int ret, integer = 0, fract = 0, fract_mult = 100000;
         bool integer_part = true, negative = false;
@@ -638,7 +638,7 @@ static ssize_t iio_show_dev_name(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);
         return sprintf(buf, "%s\n", indio_dev->name);
 }
 
@@ -724,7 +724,7 @@ static void iio_device_unregister_sysfs(struct iio_dev *indio_dev)
 
 static void iio_dev_release(struct device *device)
 {
-        struct iio_dev *indio_dev = container_of(device, struct iio_dev, dev);
+        struct iio_dev *indio_dev = dev_to_iio_dev(device);
         cdev_del(&indio_dev->chrdev);
         if (indio_dev->modes & INDIO_BUFFER_TRIGGERED)
                 iio_device_unregister_trigger_consumer(indio_dev);
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 5fcf50b1ae5a..b49059de5d02 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -186,7 +186,7 @@ static ssize_t iio_ev_state_store(struct device *dev,
                                   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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int ret;
         bool val;
@@ -205,7 +205,7 @@ static ssize_t iio_ev_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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int val = indio_dev->info->read_event_config(indio_dev,
                                                      this_attr->address);
@@ -220,7 +220,7 @@ static ssize_t iio_ev_value_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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         int val, ret;
 
@@ -237,7 +237,7 @@ static ssize_t iio_ev_value_store(struct device *dev,
                                   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 iio_dev_attr *this_attr = to_iio_dev_attr(attr);
         unsigned long val;
         int ret;
diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 1dbd7b86a694..0f582df75a19 100644
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -310,7 +310,7 @@ static ssize_t iio_trigger_read_current(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);
 
         if (indio_dev->trig)
                 return sprintf(buf, "%s\n", indio_dev->trig->name);
@@ -329,7 +329,7 @@ static ssize_t iio_trigger_write_current(struct device *dev,
                                          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 iio_trigger *oldtrig = indio_dev->trig;
         struct iio_trigger *trig;
         int ret;