staging:iio:meter:ade7758: Use private data space from iio_allocate_device

Use private data space from iio_allocate_device.
Drop dev_data in favor of iio_priv().
Fix indention issues from previous patches.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

4 files changed, 62 insertions, 70 deletions

diff --git a/drivers/staging/iio/meter/ade7758.h b/drivers/staging/iio/meter/ade7758.h
index 372a9f62b3b2..fd74e156abf9 100644
--- a/drivers/staging/iio/meter/ade7758.h
+++ b/drivers/staging/iio/meter/ade7758.h
@@ -111,7 +111,6 @@
 /**
  * struct ade7758_state - device instance specific data
  * @us:                 actual spi_device
- * @indio_dev:          industrial I/O device structure
  * @trig:               data ready trigger registered with iio
  * @tx:                 transmit buffer
  * @rx:                 receive buffer
@@ -119,21 +118,20 @@
  **/
 struct ade7758_state {
         struct spi_device       *us;
-        struct iio_dev          *indio_dev;
         struct iio_trigger      *trig;
         u8                      *tx;
         u8                      *rx;
         struct mutex            buf_lock;
         u32                     available_scan_masks[AD7758_NUM_WAVESRC];
         struct iio_chan_spec    *ade7758_ring_channels;
-        struct spi_transfer             ring_xfer[4];
-        struct spi_message              ring_msg;
+        struct spi_transfer     ring_xfer[4];
+        struct spi_message      ring_msg;
         /*
          * DMA (thus cache coherency maintenance) requires the
          * transfer buffers to live in their own cache lines.
          */
-        unsigned char                   rx_buf[8] ____cacheline_aligned;
-        unsigned char                   tx_buf[8];
+        unsigned char           rx_buf[8] ____cacheline_aligned;
+        unsigned char           tx_buf[8];
 
 };
 #ifdef CONFIG_IIO_RING_BUFFER
diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 42682ad0b26c..d9dfd8321222 100644
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -30,7 +30,7 @@ int ade7758_spi_write_reg_8(struct device *dev,
 {
         int ret;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct ade7758_state *st = iio_priv(indio_dev);
 
         mutex_lock(&st->buf_lock);
         st->tx[0] = ADE7758_WRITE_REG(reg_address);
@@ -49,7 +49,7 @@ static int ade7758_spi_write_reg_16(struct device *dev,
         int ret;
         struct spi_message msg;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct ade7758_state *st = iio_priv(indio_dev);
         struct spi_transfer xfers[] = {
                 {
                         .tx_buf = st->tx,
@@ -78,7 +78,7 @@ static int ade7758_spi_write_reg_24(struct device *dev,
         int ret;
         struct spi_message msg;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct ade7758_state *st = iio_priv(indio_dev);
         struct spi_transfer xfers[] = {
                 {
                         .tx_buf = st->tx,
@@ -107,7 +107,7 @@ int ade7758_spi_read_reg_8(struct device *dev,
 {
         struct spi_message msg;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct ade7758_state *st = iio_priv(indio_dev);
         int ret;
         struct spi_transfer xfers[] = {
                 {
@@ -150,7 +150,7 @@ static int ade7758_spi_read_reg_16(struct device *dev,
 {
         struct spi_message msg;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct ade7758_state *st = iio_priv(indio_dev);
         int ret;
         struct spi_transfer xfers[] = {
                 {
@@ -196,7 +196,7 @@ static int ade7758_spi_read_reg_24(struct device *dev,
 {
         struct spi_message msg;
         struct iio_dev *indio_dev = dev_get_drvdata(dev);
-        struct ade7758_state *st = iio_dev_get_devdata(indio_dev);
+        struct ade7758_state *st = iio_priv(indio_dev);
         int ret;
         struct spi_transfer xfers[] = {
                 {
@@ -485,10 +485,11 @@ static int ade7758_stop_device(struct device *dev)
         return ret;
 }
 
-static int ade7758_initial_setup(struct ade7758_state *st)
+static int ade7758_initial_setup(struct iio_dev *indio_dev)
 {
+        struct ade7758_state *st = iio_priv(indio_dev);
+        struct device *dev = &indio_dev->dev;
         int ret;
-        struct device *dev = &st->indio_dev->dev;
 
         /* use low spi speed for init */
         st->us->mode = SPI_MODE_1;
@@ -727,19 +728,23 @@ static struct iio_chan_spec ade7758_channels[] = {
 static int __devinit ade7758_probe(struct spi_device *spi)
 {
         int i, ret, regdone = 0;
-        struct ade7758_state *st = kzalloc(sizeof *st, GFP_KERNEL);
-        if (!st) {
-                ret =  -ENOMEM;
+        struct ade7758_state *st;
+        struct iio_dev *indio_dev = iio_allocate_device(sizeof(*st));
+
+        if (indio_dev == NULL) {
+                ret = -ENOMEM;
                 goto error_ret;
         }
+
+        st = iio_priv(indio_dev);
         /* this is only used for removal purposes */
-        spi_set_drvdata(spi, st);
+        spi_set_drvdata(spi, indio_dev);
 
         /* Allocate the comms buffers */
         st->rx = kzalloc(sizeof(*st->rx)*ADE7758_MAX_RX, GFP_KERNEL);
         if (st->rx == NULL) {
                 ret = -ENOMEM;
-                goto error_free_st;
+                goto error_free_dev;
         }
         st->tx = kzalloc(sizeof(*st->tx)*ADE7758_MAX_TX, GFP_KERNEL);
         if (st->tx == NULL) {
@@ -749,35 +754,28 @@ static int __devinit ade7758_probe(struct spi_device *spi)
         st->us = spi;
         st->ade7758_ring_channels = &ade7758_channels[0];
         mutex_init(&st->buf_lock);
-        /* setup the industrialio driver allocated elements */
-        st->indio_dev = iio_allocate_device(0);
-        if (st->indio_dev == NULL) {
-                ret = -ENOMEM;