Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: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 14543a00

drivers/staging/iio/accel/lis3l02dq_core.c

+3 −15
Original line number Diff line number Diff line
@@ -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;

drivers/staging/iio/accel/sca3000_core.c

+2 −11
Original line number Diff line number Diff line
@@ -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));

}



/**

drivers/staging/iio/accel/sca3000_ring.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

drivers/staging/iio/adc/ad7280a.c

+1 −5
Original line number Diff line number Diff line
@@ -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;

drivers/staging/iio/frequency/ad5930.c

+1 −4
Original line number Diff line number Diff line
@@ -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: