staging:iio:meter:ade7754: allocate state with iio_dev and buffers in state.

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

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index 378f2c8..f4f85fd 100644 (file)
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -29,7 +29,7 @@ static int ade7754_spi_write_reg_8(struct device *dev,
 {
        int ret;
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+       struct ade7754_state *st = iio_priv(indio_dev);
 
        mutex_lock(&st->buf_lock);
        st->tx[0] = ADE7754_WRITE_REG(reg_address);
@@ -47,7 +47,7 @@ static int ade7754_spi_write_reg_16(struct device *dev,
 {
        int ret;
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+       struct ade7754_state *st = iio_priv(indio_dev);
 
        mutex_lock(&st->buf_lock);
        st->tx[0] = ADE7754_WRITE_REG(reg_address);
@@ -64,7 +64,7 @@ static int ade7754_spi_read_reg_8(struct device *dev,
                u8 *val)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+       struct ade7754_state *st = iio_priv(indio_dev);
        int ret;
 
        ret = spi_w8r8(st->us, ADE7754_READ_REG(reg_address));
@@ -83,7 +83,7 @@ static int ade7754_spi_read_reg_16(struct device *dev,
                u16 *val)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+       struct ade7754_state *st = iio_priv(indio_dev);
        int ret;
 
        ret = spi_w8r16(st->us, ADE7754_READ_REG(reg_address));
@@ -105,7 +105,7 @@ static int ade7754_spi_read_reg_24(struct device *dev,
 {
        struct spi_message msg;
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+       struct ade7754_state *st = iio_priv(indio_dev);
        int ret;
        struct spi_transfer xfers[] = {
                {
@@ -388,10 +388,11 @@ static int ade7754_stop_device(struct device *dev)
        return ade7754_spi_write_reg_8(dev, ADE7754_OPMODE, val);
 }
 
-static int ade7754_initial_setup(struct ade7754_state *st)
+static int ade7754_initial_setup(struct iio_dev *indio_dev)
 {
        int ret;
-       struct device *dev = &st->indio_dev->dev;
+       struct ade7754_state *st = iio_priv(indio_dev);
+       struct device *dev = &indio_dev->dev;
 
        /* use low spi speed for init */
        st->us->mode = SPI_MODE_3;
@@ -436,7 +437,7 @@ static ssize_t ade7754_write_frequency(struct device *dev,
                size_t len)
 {
        struct iio_dev *indio_dev = dev_get_drvdata(dev);
-       struct ade7754_state *st = iio_dev_get_devdata(indio_dev);
+       struct ade7754_state *st = iio_priv(indio_dev);
        unsigned long val;
        int ret;
        u8 reg, t;
@@ -535,62 +536,44 @@ static const struct iio_info ade7754_info = {
 static int __devinit ade7754_probe(struct spi_device *spi)
 {
        int ret, regdone = 0;
-       struct ade7754_state *st = kzalloc(sizeof *st, GFP_KERNEL);
-       if (!st) {
-               ret =  -ENOMEM;
+       struct ade7754_state *st;
+       struct iio_dev *indio_dev;
+
+       /* setup the industrialio driver allocated elements */
+       indio_dev = iio_allocate_device(sizeof(*st));
+       if (indio_dev == NULL) {
+               ret = -ENOMEM;
                goto error_ret;
        }
        /* 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)*ADE7754_MAX_RX, GFP_KERNEL);
-       if (st->rx == NULL) {
-               ret = -ENOMEM;
-               goto error_free_st;
-       }
-       st->tx = kzalloc(sizeof(*st->tx)*ADE7754_MAX_TX, GFP_KERNEL);
-       if (st->tx == NULL) {
-               ret = -ENOMEM;
-               goto error_free_rx;
-       }
+       st = iio_priv(indio_dev);
        st->us = spi;
        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;
-               goto error_free_tx;
-       }
 
-       st->indio_dev->name = spi->dev.driver->name;
-       st->indio_dev->dev.parent = &spi->dev;
-       st->indio_dev->info = &ade7754_info;
-       st->indio_dev->dev_data = (void *)(st);
-       st->indio_dev->modes = INDIO_DIRECT_MODE;
+       indio_dev->name = spi->dev.driver->name;
+       indio_dev->dev.parent = &spi->dev;
+       indio_dev->info = &ade7754_info;
+       indio_dev->modes = INDIO_DIRECT_MODE;
 
-       ret = iio_device_register(st->indio_dev);
+       ret = iio_device_register(indio_dev);
        if (ret)
                goto error_free_dev;
        regdone = 1;
 
        /* Get the device into a sane initial state */
-       ret = ade7754_initial_setup(st);
+       ret = ade7754_initial_setup(indio_dev);
        if (ret)
                goto error_free_dev;
        return 0;
 
 error_free_dev:
        if (regdone)
-               iio_device_unregister(st->indio_dev);
+               iio_device_unregister(indio_dev);
        else
-               iio_free_device(st->indio_dev);
-error_free_tx:
-       kfree(st->tx);
-error_free_rx:
-       kfree(st->rx);
-error_free_st:
-       kfree(st);
+               iio_free_device(indio_dev);
+
 error_ret:
        return ret;
 }
@@ -599,22 +582,17 @@ error_ret:
 static int ade7754_remove(struct spi_device *spi)
 {
        int ret;
-       struct ade7754_state *st = spi_get_drvdata(spi);
-       struct iio_dev *indio_dev = st->indio_dev;
+       struct iio_dev *indio_dev = spi_get_drvdata(spi);
 
        ret = ade7754_stop_device(&(indio_dev->dev));
        if (ret)
                goto err_ret;
 
        iio_device_unregister(indio_dev);
-       kfree(st->tx);
-       kfree(st->rx);
-       kfree(st);
-
-       return 0;
 
 err_ret:
        return ret;
+
 }
 
 static struct spi_driver ade7754_driver = {

diff --git a/drivers/staging/iio/meter/ade7754.h b/drivers/staging/iio/meter/ade7754.h
index 0aa0522..6121125 100644 (file)
--- a/drivers/staging/iio/meter/ade7754.h
+++ b/drivers/staging/iio/meter/ade7754.h
@@ -78,17 +78,15 @@
 /**
  * struct ade7754_state - device instance specific data
  * @us:                        actual spi_device
- * @indio_dev:         industrial I/O device structure
+ * @buf_lock:          mutex to protect tx and rx
  * @tx:                        transmit buffer
  * @rx:                        receive buffer
- * @buf_lock:          mutex to protect tx and rx
  **/
 struct ade7754_state {
-       struct spi_device               *us;
-       struct iio_dev                  *indio_dev;
-       u8                              *tx;
-       u8                              *rx;
-       struct mutex                    buf_lock;
+       struct spi_device       *us;
+       struct mutex            buf_lock;
+       u8                      tx[ADE7754_MAX_TX] ____cacheline_aligned;
+       u8                      rx[ADE7754_MAX_RX];
 };
 
 #endif