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

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

diff --git a/drivers/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c
index 7f9045e6daa4c863bf6075a85319b1bdd12a1fe1..5b7acd3a2c77865b8cc3e777d17f43f845f45246 100644 (file)
--- a/drivers/iio/dac/ad5764.c
+++ b/drivers/iio/dac/ad5764.c
@@ -135,7 +135,6 @@ static int ad5764_read(struct iio_dev *indio_dev, unsigned int reg,
        unsigned int *val)
 {
        struct ad5764_state *st = iio_priv(indio_dev);
-       struct spi_message m;
        int ret;
        struct spi_transfer t[] = {
                {
@@ -148,15 +147,11 @@ static int ad5764_read(struct iio_dev *indio_dev, unsigned int reg,
                },
        };
 
-       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((1 << 23) | (reg << 16));
 
-       ret = spi_sync(st->spi, &m);
+       ret = spi_sync_transfer(st->spi, t, ARRAY_SIZE(t));
        if (ret >= 0)
                *val = be32_to_cpu(st->data[1].d32) & 0xffff;