Merge tag 'vfio-v3.9-rc7' of git://github.com/awilliam/linux-vfio

[firefly-linux-kernel-4.4.55.git] / drivers / iio / dac / ad5755.c

diff --git a/drivers/iio/dac/ad5755.c b/drivers/iio/dac/ad5755.c
index 0869bbd27d30e67d724621ee95d7cdf315286caa..71faabc6b14e1f9ff143ee6ae826de5b2c61bf9c 100644 (file)
--- a/drivers/iio/dac/ad5755.c
+++ b/drivers/iio/dac/ad5755.c
@@ -153,7 +153,6 @@ static int ad5755_write_ctrl(struct iio_dev *indio_dev, unsigned int channel,
 static int ad5755_read(struct iio_dev *indio_dev, unsigned int addr)
 {
        struct ad5755_state *st = iio_priv(indio_dev);
-       struct spi_message m;
        int ret;
        struct spi_transfer t[] = {
                {
@@ -167,16 +166,12 @@ static int ad5755_read(struct iio_dev *indio_dev, unsigned int addr)
                },
        };
 
-       spi_message_init(&m);
-       spi_message_add_tail(&t[0], &m);
-       spi_message_add_tail(&t[1], &m);
-
        mutex_lock(&indio_dev->mlock);
 
        st->data[0].d32 = cpu_to_be32(AD5755_READ_FLAG | (addr << 16));
        st->data[1].d32 = cpu_to_be32(AD5755_NOOP);
 
-       ret = spi_sync(st->spi, &m);
+       ret = spi_sync_transfer(st->spi, t, ARRAY_SIZE(t));
        if (ret >= 0)
                ret = be32_to_cpu(st->data[1].d32) & 0xffff;