Commit 14543a00 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

iio: Use spi_sync_transfer() 



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

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 6d9eecd4

drivers/iio/accel/kxsd9.c

+1 −5
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro) 


static int kxsd9_read(struct iio_dev *indio_dev, u8 address)

{

	struct spi_message msg;

	int ret;

	struct kxsd9_state *st = iio_priv(indio_dev);

	struct spi_transfer xfers[] = {
@@ -112,10 +111,7 @@ static int kxsd9_read(struct iio_dev *indio_dev, u8 address) 


	mutex_lock(&st->buf_lock);

	st->tx[0] = KXSD9_READ(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)

		return ret;

	return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);

drivers/iio/dac/ad5360.c

+1 −6
Original line number Diff line number Diff line
@@ -213,7 +213,6 @@ static int ad5360_read(struct iio_dev *indio_dev, unsigned int type, 
	unsigned int addr)

{

	struct ad5360_state *st = iio_priv(indio_dev);

	struct spi_message m;

	int ret;

	struct spi_transfer t[] = {

		{
@@ -226,10 +225,6 @@ static int ad5360_read(struct iio_dev *indio_dev, unsigned int type, 
		},

	};



	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(AD5360_CMD(AD5360_CMD_SPECIAL_FUNCTION) |
@@ -237,7 +232,7 @@ static int ad5360_read(struct iio_dev *indio_dev, unsigned int type, 
		AD5360_READBACK_TYPE(type) |

		AD5360_READBACK_ADDR(addr));



	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;

drivers/iio/dac/ad5421.c

+1 −6
Original line number Diff line number Diff line
@@ -127,7 +127,6 @@ static int ad5421_write(struct iio_dev *indio_dev, unsigned int reg, 
static int ad5421_read(struct iio_dev *indio_dev, unsigned int reg)

{

	struct ad5421_state *st = iio_priv(indio_dev);

	struct spi_message m;

	int ret;

	struct spi_transfer t[] = {

		{
@@ -140,15 +139,11 @@ static int ad5421_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)

		ret = be32_to_cpu(st->data[1].d32) & 0xffff;

drivers/iio/dac/ad5504.c

+1 −5
Original line number Diff line number Diff line
@@ -85,11 +85,7 @@ static int ad5504_spi_read(struct spi_device *spi, u8 addr) 
			.rx_buf		= &val,

			.len		= 2,

		};

	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 < 0)

		return ret;

drivers/iio/dac/ad5686.c

+1 −6
Original line number Diff line number Diff line
@@ -117,18 +117,13 @@ static int ad5686_spi_read(struct ad5686_state *st, u8 addr) 
			.len = 3,

		},

	};

	struct spi_message m;

	int ret;



	spi_message_init(&m);

	spi_message_add_tail(&t[0], &m);

	spi_message_add_tail(&t[1], &m);



	st->data[0].d32 = cpu_to_be32(AD5686_CMD(AD5686_CMD_READBACK_ENABLE) |

			      AD5686_ADDR(addr));

	st->data[1].d32 = cpu_to_be32(AD5686_CMD(AD5686_CMD_NOOP));



	ret = spi_sync(st->spi, &m);

	ret = spi_sync_transfer(st->spi, t, ARRAY_SIZE(t));

	if (ret < 0)

		return ret;