kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iio:common: Use spi_sync_transfer() in STMicroelectronics common library

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

Signed-off-by: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Denis Ciocca 2013-02-09 16:08:00 +00:00 committed by Jonathan Cameron
parent 0eac259db2
commit 43bb786ad2
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/iio/common/st_sensors/st_sensors_spi.c
View file

@ -29,7 +29,6 @@ static unsigned int st_sensors_spi_get_irq(struct iio_dev *indio_dev)
static int st_sensors_spi_read(struct st_sensor_transfer_buffer *tb, static int st_sensors_spi_read(struct st_sensor_transfer_buffer *tb,
struct device *dev, u8 reg_addr, int len, u8 *data, bool multiread_bit) struct device *dev, u8 reg_addr, int len, u8 *data, bool multiread_bit)
{ {
struct spi_message msg;
int err; int err;
struct spi_transfer xfers[] = { struct spi_transfer xfers[] = {
@ -51,10 +50,7 @@ static int st_sensors_spi_read(struct st_sensor_transfer_buffer *tb,
else else
tb->tx_buf[0] = reg_addr | ST_SENSORS_SPI_READ; tb->tx_buf[0] = reg_addr | ST_SENSORS_SPI_READ;
spi_message_init(&msg); err = spi_sync_transfer(to_spi_device(dev), xfers, ARRAY_SIZE(xfers));
spi_message_add_tail(&xfers[0], &msg);
spi_message_add_tail(&xfers[1], &msg);
err = spi_sync(to_spi_device(dev), &msg);
if (err) if (err)
goto acc_spi_read_error; goto acc_spi_read_error;
@ -83,7 +79,6 @@ static int st_sensors_spi_read_multiple_byte(
static int st_sensors_spi_write_byte(struct st_sensor_transfer_buffer *tb, static int st_sensors_spi_write_byte(struct st_sensor_transfer_buffer *tb,
struct device *dev, u8 reg_addr, u8 data) struct device *dev, u8 reg_addr, u8 data)
{ {
struct spi_message msg;
int err; int err;
struct spi_transfer xfers = { struct spi_transfer xfers = {
@ -96,9 +91,7 @@ static int st_sensors_spi_write_byte(struct st_sensor_transfer_buffer *tb,
tb->tx_buf[0] = reg_addr; tb->tx_buf[0] = reg_addr;
tb->tx_buf[1] = data; tb->tx_buf[1] = data;
spi_message_init(&msg); err = spi_sync_transfer(to_spi_device(dev), &xfers, 1);
spi_message_add_tail(&xfers, &msg);
err = spi_sync(to_spi_device(dev), &msg);
mutex_unlock(&tb->buf_lock); mutex_unlock(&tb->buf_lock);
return err; return err;