staging:iio: Use spi_sync_transfer()

Use the new spi_sync_transfer() helper function instead of open-coding it.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index 37ed1b8ebb6f7bbd68e0696aaa263b1d72c55cf0..0e019306439cd86fff57ab2e7b7bd28cb1f9d7ad 100644 (file)
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -53,7 +53,6 @@ int lis3l02dq_spi_read_reg_8(struct iio_dev *indio_dev,
                             u8 reg_address, u8 *val)
 {
        struct lis3l02dq_state *st = iio_priv(indio_dev);
-       struct spi_message msg;
        int ret;
        struct spi_transfer xfer = {
                .tx_buf = st->tx,
@@ -66,9 +65,7 @@ int lis3l02dq_spi_read_reg_8(struct iio_dev *indio_dev,
        st->tx[0] = LIS3L02DQ_READ_REG(reg_address);
        st->tx[1] = 0;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, &xfer, 1);
        *val = st->rx[1];
        mutex_unlock(&st->buf_lock);
 
@@ -109,7 +106,6 @@ static int lis3l02dq_spi_write_reg_s16(struct iio_dev *indio_dev,
                                       s16 value)
 {
        int ret;
-       struct spi_message msg;
        struct lis3l02dq_state *st = iio_priv(indio_dev);
        struct spi_transfer xfers[] = { {
                        .tx_buf = st->tx,
@@ -129,10 +125,7 @@ static int lis3l02dq_spi_write_reg_s16(struct iio_dev *indio_dev,
        st->tx[2] = LIS3L02DQ_WRITE_REG(lower_reg_address + 1);
        st->tx[3] = (value >> 8) & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -143,8 +136,6 @@ static int lis3l02dq_read_reg_s16(struct iio_dev *indio_dev,
                                  int *val)
 {
        struct lis3l02dq_state *st = iio_priv(indio_dev);
-
-       struct spi_message msg;
        int ret;
        s16 tempval;
        struct spi_transfer xfers[] = { {
@@ -167,10 +158,7 @@ static int lis3l02dq_read_reg_s16(struct iio_dev *indio_dev,
        st->tx[2] = LIS3L02DQ_READ_REG(lower_reg_address + 1);
        st->tx[3] = 0;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 16 bit register");
                goto error_ret;

diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 414d3cad55a7542487305d197432857d62c32fef..14683f583ccfb27ded6ed02f01338be325457bc5 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -90,7 +90,6 @@ int sca3000_read_data_short(struct sca3000_state *st,
                            uint8_t reg_address_high,
                            int len)
 {
-       struct spi_message msg;
        struct spi_transfer xfer[2] = {
                {
                        .len = 1,
@@ -101,11 +100,8 @@ int sca3000_read_data_short(struct sca3000_state *st,
                }
        };
        st->tx[0] = SCA3000_READ_REG(reg_address_high);
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer[0], &msg);
-       spi_message_add_tail(&xfer[1], &msg);
 
-       return spi_sync(st->us, &msg);
+       return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
 }
 
 /**
@@ -133,7 +129,6 @@ static int sca3000_reg_lock_on(struct sca3000_state *st)
  **/
 static int __sca3000_unlock_reg_lock(struct sca3000_state *st)
 {
-       struct spi_message msg;
        struct spi_transfer xfer[3] = {
                {
                        .len = 2,
@@ -154,12 +149,8 @@ static int __sca3000_unlock_reg_lock(struct sca3000_state *st)
        st->tx[3] = 0x50;
        st->tx[4] = SCA3000_WRITE_REG(SCA3000_REG_ADDR_UNLOCK);
        st->tx[5] = 0xA0;
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer[0], &msg);
-       spi_message_add_tail(&xfer[1], &msg);
-       spi_message_add_tail(&xfer[2], &msg);
 
-       return spi_sync(st->us, &msg);
+       return spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
 }
 
 /**

diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index cbec2f1665e5bd06e4e98bc6ee155eb64637f7a9..3e5e860aa38eec64ad8805c6b33c03952d6acad0 100644 (file)
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ b/drivers/staging/iio/accel/sca3000_ring.c
@@ -39,7 +39,6 @@ static int sca3000_read_data(struct sca3000_state *st,
                            int len)
 {
        int ret;
-       struct spi_message msg;
        struct spi_transfer xfer[2] = {
                {
                        .len = 1,
@@ -55,10 +54,7 @@ static int sca3000_read_data(struct sca3000_state *st,
        }
        xfer[1].rx_buf = *rx_p;
        st->tx[0] = SCA3000_READ_REG(reg_address_high);
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer[0], &msg);
-       spi_message_add_tail(&xfer[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfer, ARRAY_SIZE(xfer));
        if (ret) {
                dev_err(get_device(&st->us->dev), "problem reading register");
                goto error_free_rx;

diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c
index fa81a491e790a2fd2e1319601937acd24e997b00..1f190c1b12a600c058ece50d1cdf2a6628bf7868 100644 (file)
--- a/drivers/staging/iio/adc/ad7280a.c
+++ b/drivers/staging/iio/adc/ad7280a.c
@@ -199,12 +199,8 @@ static int __ad7280_read32(struct spi_device *spi, unsigned *val)
                .rx_buf = &rx_buf,
                .len = 4,
        };
-       struct spi_message m;
 
-       spi_message_init(&m);
-       spi_message_add_tail(&t, &m);
-
-       ret = spi_sync(spi, &m);
+       ret = spi_sync_transfer(spi, &t, 1);
        if (ret)
                return ret;
 

diff --git a/drivers/staging/iio/frequency/ad5930.c b/drivers/staging/iio/frequency/ad5930.c
index 23777be38b18a0cd9b8ba5954abd724eec152e32..69e90e9e60eaa9642075a5402655bf3e94d03401 100644 (file)
--- a/drivers/staging/iio/frequency/ad5930.c
+++ b/drivers/staging/iio/frequency/ad5930.c
@@ -44,7 +44,6 @@ static ssize_t ad5930_set_parameter(struct device *dev,
                                        const char *buf,
                                        size_t len)
 {
-       struct spi_message msg;
        struct spi_transfer xfer;
        int ret;
        struct ad5903_config *config = (struct ad5903_config *)buf;
@@ -64,9 +63,7 @@ static ssize_t ad5930_set_parameter(struct device *dev,
        xfer.tx_buf = config;
        mutex_lock(&st->lock);
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->sdev, &msg);
+       ret = spi_sync_transfer(st->sdev, &xfer, 1);
        if (ret)
                goto error_ret;
 error_ret:

diff --git a/drivers/staging/iio/frequency/ad9850.c b/drivers/staging/iio/frequency/ad9850.c
index 104f7a4905a37471745cd048861f0f2a75d9fac4..01a8a93031f54887d76961afe781f504bd65d8d8 100644 (file)
--- a/drivers/staging/iio/frequency/ad9850.c
+++ b/drivers/staging/iio/frequency/ad9850.c
@@ -39,7 +39,6 @@ static ssize_t ad9850_set_parameter(struct device *dev,
                                        const char *buf,
                                        size_t len)
 {
-       struct spi_message msg;
        struct spi_transfer xfer;
        int ret;
        struct ad9850_config *config = (struct ad9850_config *)buf;
@@ -50,9 +49,7 @@ static ssize_t ad9850_set_parameter(struct device *dev,
        xfer.tx_buf = config;
        mutex_lock(&st->lock);
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->sdev, &msg);
+       ret = spi_sync_transfer(st->sdev, &xfer, 1);
        if (ret)
                goto error_ret;
 error_ret:

diff --git a/drivers/staging/iio/frequency/ad9852.c b/drivers/staging/iio/frequency/ad9852.c
index 17ac825b3d261114c25fd9a7ef30d03b262f1557..1344031232bca7cb2c0ce93e3c11a427d9a136e0 100644 (file)
--- a/drivers/staging/iio/frequency/ad9852.c
+++ b/drivers/staging/iio/frequency/ad9852.c
@@ -183,7 +183,6 @@ static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9852_set_parameter, 0);
 
 static void ad9852_init(struct ad9852_state *st)
 {
-       struct spi_message msg;
        struct spi_transfer xfer;
        int ret;
        u8 config[5];
@@ -199,9 +198,7 @@ static void ad9852_init(struct ad9852_state *st)
        xfer.len = 5;
        xfer.tx_buf = &config;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->sdev, &msg);
+       ret = spi_sync_transfer(st->sdev, &xfer, 1);
        if (ret)
                goto error_ret;
 

diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 51c3bdece7851e13e1eaf8924d63dacbdf186c29..e5943e2287cfbb5519cc59d8e8a6e7f4c7e1b1b8 100644 (file)
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -103,7 +103,6 @@ static int ade7753_spi_read_reg_24(struct device *dev,
                u8 reg_address,
                u32 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7753_state *st = iio_priv(indio_dev);
        int ret;
@@ -122,10 +121,7 @@ static int ade7753_spi_read_reg_24(struct device *dev,
        mutex_lock(&st->buf_lock);
        st->tx[0] = ADE7753_READ_REG(reg_address);
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
                                reg_address);

diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c
index b50c89e93993e03712e3f0b7b7e89969ad9b30ef..7b6503bf9a74ed332872b2e97f03e0f3b3c085c6 100644 (file)
--- a/drivers/staging/iio/meter/ade7754.c
+++ b/drivers/staging/iio/meter/ade7754.c
@@ -103,7 +103,6 @@ static int ade7754_spi_read_reg_24(struct device *dev,
                u8 reg_address,
                u32 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7754_state *st = iio_priv(indio_dev);
        int ret;
@@ -122,9 +121,7 @@ static int ade7754_spi_read_reg_24(struct device *dev,
        st->tx[2] = 0;
        st->tx[3] = 0;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(xfers, &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
                                reg_address);

diff --git a/drivers/staging/iio/meter/ade7758_core.c b/drivers/staging/iio/meter/ade7758_core.c
index 3454e5154ed2cebd1d0d32e2b922de708c1ef672..53c68dcc4544567bdd1c0f70401fb867e834defb 100644 (file)
--- a/drivers/staging/iio/meter/ade7758_core.c
+++ b/drivers/staging/iio/meter/ade7758_core.c
@@ -47,7 +47,6 @@ static int ade7758_spi_write_reg_16(struct device *dev,
                u16 value)
 {
        int ret;
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7758_state *st = iio_priv(indio_dev);
        struct spi_transfer xfers[] = {
@@ -63,9 +62,7 @@ static int ade7758_spi_write_reg_16(struct device *dev,
        st->tx[1] = (value >> 8) & 0xFF;
        st->tx[2] = value & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(xfers, &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -76,7 +73,6 @@ static int ade7758_spi_write_reg_24(struct device *dev,
                u32 value)
 {
        int ret;
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7758_state *st = iio_priv(indio_dev);
        struct spi_transfer xfers[] = {
@@ -93,9 +89,7 @@ static int ade7758_spi_write_reg_24(struct device *dev,
        st->tx[2] = (value >> 8) & 0xFF;
        st->tx[3] = value & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(xfers, &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -105,7 +99,6 @@ int ade7758_spi_read_reg_8(struct device *dev,
                u8 reg_address,
                u8 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7758_state *st = iio_priv(indio_dev);
        int ret;
@@ -128,10 +121,7 @@ int ade7758_spi_read_reg_8(struct device *dev,
        st->tx[0] = ADE7758_READ_REG(reg_address);
        st->tx[1] = 0;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
                                reg_address);
@@ -148,7 +138,6 @@ static int ade7758_spi_read_reg_16(struct device *dev,
                u8 reg_address,
                u16 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7758_state *st = iio_priv(indio_dev);
        int ret;
@@ -173,10 +162,7 @@ static int ade7758_spi_read_reg_16(struct device *dev,
        st->tx[1] = 0;
        st->tx[2] = 0;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",
                                reg_address);
@@ -194,7 +180,6 @@ static int ade7758_spi_read_reg_24(struct device *dev,
                u8 reg_address,
                u32 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7758_state *st = iio_priv(indio_dev);
        int ret;
@@ -219,10 +204,7 @@ static int ade7758_spi_read_reg_24(struct device *dev,
        st->tx[2] = 0;
        st->tx[3] = 0;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
                                reg_address);

diff --git a/drivers/staging/iio/meter/ade7759.c b/drivers/staging/iio/meter/ade7759.c
index 10b911bd3853ae38fca5dcacd00a37ab9425cdec..17dc373e1082f254b9bdce07fe2c47c530b13bed 100644 (file)
--- a/drivers/staging/iio/meter/ade7759.c
+++ b/drivers/staging/iio/meter/ade7759.c
@@ -103,7 +103,6 @@ static int ade7759_spi_read_reg_40(struct device *dev,
                u8 reg_address,
                u64 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7759_state *st = iio_priv(indio_dev);
        int ret;
@@ -120,9 +119,7 @@ static int ade7759_spi_read_reg_40(struct device *dev,
        st->tx[0] = ADE7759_READ_REG(reg_address);
        memset(&st->tx[1], 0 , 5);
 
-       spi_message_init(&msg);
-       spi_message_add_tail(xfers, &msg);
-       ret = spi_sync(st->us, &msg);
+       ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->us->dev, "problem when reading 40 bit register 0x%02X",
                                reg_address);

diff --git a/drivers/staging/iio/meter/ade7854-spi.c b/drivers/staging/iio/meter/ade7854-spi.c
index f0984fa1cbb92767dc0997915aee46282f1a2d11..a802cf2491d61a6d55f95c6e6825792905fa118a 100644 (file)
--- a/drivers/staging/iio/meter/ade7854-spi.c
+++ b/drivers/staging/iio/meter/ade7854-spi.c
@@ -20,7 +20,6 @@ static int ade7854_spi_write_reg_8(struct device *dev,
                u8 value)
 {
        int ret;
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        struct spi_transfer xfer = {
@@ -35,9 +34,7 @@ static int ade7854_spi_write_reg_8(struct device *dev,
        st->tx[2] = reg_address & 0xFF;
        st->tx[3] = value & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, &xfer, 1);
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -48,7 +45,6 @@ static int ade7854_spi_write_reg_16(struct device *dev,
                u16 value)
 {
        int ret;
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        struct spi_transfer xfer = {
@@ -64,9 +60,7 @@ static int ade7854_spi_write_reg_16(struct device *dev,
        st->tx[3] = (value >> 8) & 0xFF;
        st->tx[4] = value & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, &xfer, 1);
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -77,7 +71,6 @@ static int ade7854_spi_write_reg_24(struct device *dev,
                u32 value)
 {
        int ret;
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        struct spi_transfer xfer = {
@@ -94,9 +87,7 @@ static int ade7854_spi_write_reg_24(struct device *dev,
        st->tx[4] = (value >> 8) & 0xFF;
        st->tx[5] = value & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, &xfer, 1);
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -107,7 +98,6 @@ static int ade7854_spi_write_reg_32(struct device *dev,
                u32 value)
 {
        int ret;
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        struct spi_transfer xfer = {
@@ -125,9 +115,7 @@ static int ade7854_spi_write_reg_32(struct device *dev,
        st->tx[5] = (value >> 8) & 0xFF;
        st->tx[6] = value & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, &xfer, 1);
        mutex_unlock(&st->buf_lock);
 
        return ret;
@@ -137,7 +125,6 @@ static int ade7854_spi_read_reg_8(struct device *dev,
                u16 reg_address,
                u8 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        int ret;
@@ -159,10 +146,7 @@ static int ade7854_spi_read_reg_8(struct device *dev,
        st->tx[1] = (reg_address >> 8) & 0xFF;
        st->tx[2] = reg_address & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->spi->dev, "problem when reading 8 bit register 0x%02X",
                                reg_address);
@@ -179,7 +163,6 @@ static int ade7854_spi_read_reg_16(struct device *dev,
                u16 reg_address,
                u16 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        int ret;
@@ -200,10 +183,7 @@ static int ade7854_spi_read_reg_16(struct device *dev,
        st->tx[1] = (reg_address >> 8) & 0xFF;
        st->tx[2] = reg_address & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->spi->dev, "problem when reading 16 bit register 0x%02X",
                                reg_address);
@@ -220,7 +200,6 @@ static int ade7854_spi_read_reg_24(struct device *dev,
                u16 reg_address,
                u32 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        int ret;
@@ -242,10 +221,7 @@ static int ade7854_spi_read_reg_24(struct device *dev,
        st->tx[1] = (reg_address >> 8) & 0xFF;
        st->tx[2] = reg_address & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->spi->dev, "problem when reading 24 bit register 0x%02X",
                                reg_address);
@@ -262,7 +238,6 @@ static int ade7854_spi_read_reg_32(struct device *dev,
                u16 reg_address,
                u32 *val)
 {
-       struct spi_message msg;
        struct iio_dev *indio_dev = dev_to_iio_dev(dev);
        struct ade7854_state *st = iio_priv(indio_dev);
        int ret;
@@ -284,10 +259,7 @@ static int ade7854_spi_read_reg_32(struct device *dev,
        st->tx[1] = (reg_address >> 8) & 0xFF;
        st->tx[2] = reg_address & 0xFF;
 
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfers[0], &msg);
-       spi_message_add_tail(&xfers[1], &msg);
-       ret = spi_sync(st->spi, &msg);
+       ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
        if (ret) {
                dev_err(&st->spi->dev, "problem when reading 32 bit register 0x%02X",
                                reg_address);

diff --git a/drivers/staging/iio/resolver/ad2s1210.c b/drivers/staging/iio/resolver/ad2s1210.c
index ed07a348eb55c71d1962b3061a2a4601693829c2..53110b6a3c7401b8b391f45609eab4714e7f1844 100644 (file)
--- a/drivers/staging/iio/resolver/ad2s1210.c
+++ b/drivers/staging/iio/resolver/ad2s1210.c
@@ -130,15 +130,12 @@ static int ad2s1210_config_read(struct ad2s1210_state *st,
                .rx_buf = st->rx,
                .tx_buf = st->tx,
        };
-       struct spi_message msg;
        int ret = 0;
 
        ad2s1210_set_mode(MOD_CONFIG, st);
-       spi_message_init(&msg);
-       spi_message_add_tail(&xfer, &msg);
        st->tx[0] = address | AD2S1210_MSB_IS_HIGH;
        st->tx[1] = AD2S1210_REG_FAULT;
-       ret = spi_sync(st->sdev, &msg);
+       ret = spi_sync_transfer(st->sdev, &xfer, 1);
        if (ret < 0)
                return ret;
        st->old_data = true;