iio:ad5449: Use spi_sync_transfer()
Subsystems (4)
PATCH 1/8 iio:ad5449: Use spi_sync_transfer()
Use the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/iio/dac/ad5449.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/iio/dac/ad5449.c +1 -6
@@ -101,7 +101,6 @@ static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr, {struct ad5449 *st =iio_priv (indio_dev);int ret; -struct spi_message msg;struct spi_transfer t[] = { { .tx_buf = &st->data[0 ],
@@ -114,15 +113,11 @@ static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr, }, }; -spi_message_init (&msg); -spi_message_add_tail (&t[0 ], &msg); -spi_message_add_tail (&t[1 ], &msg); -mutex_lock (&indio_dev->mlock); st->data[0 ] =cpu_to_be16 (addr <<12 ); st->data[1 ] =cpu_to_be16 (AD5449_CMD_NOOP ); - ret =spi_sync (st->spi, &msg); + ret =spi_sync_transfer (st->spi, t,ARRAY_SIZE (t));if (ret <0 ) goto out_unlock;
Signature · 1 line
1.8.0
PATCH 2/8 iio:adis16080: Use spi_sync_transfer()
Use the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/iio/gyro/adis16080.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/iio/gyro/adis16080.c +1 -6
@@ -51,7 +51,6 @@ static int adis16080_read_sample(struct iio_dev *indio_dev, u16 addr, int *val) { struct adis16080_state *st = iio_priv(indio_dev); -struct spi_message m;int ret; struct spi_transfer t[] = { {
@@ -66,11 +65,7 @@ static int adis16080_read_sample(struct iio_dev *indio_dev, st->buf =cpu_to_be16 (addr |ADIS16080_DIN_WRITE ); -spi_message_init (&m); -spi_message_add_tail (&t[0 ], &m); -spi_message_add_tail (&t[1 ], &m); - - ret =spi_sync (st->us, &m); + ret =spi_sync_transfer (st->us, t,ARRAY_SIZE (t));if (ret ==0 ) *val =sign_extend32 (be16_to_cpu (st->buf),11 );
Signature · 1 line
1.8.0
Re: [PATCH 2/8] iio:adis16080: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied to the togreg branch of iio.git
Thanks,
Quoted 30 lines
--- drivers/iio/gyro/adis16080.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/iio/gyro/adis16080.c +1
-6@@ -51,7 +51,6 @@ static int adis16080_read_sample(struct iio_dev *indio_dev, u16 addr, int *val) { struct adis16080_state *st = iio_priv(indio_dev); -struct spi_message m;int ret; struct spi_transfer t[] = { {@@ -66,11 +65,7 @@ static int adis16080_read_sample(struct iio_dev *indio_dev, st->buf =cpu_to_be16 (addr |ADIS16080_DIN_WRITE ); -spi_message_init (&m); -spi_message_add_tail (&t[0 ], &m); -spi_message_add_tail (&t[1 ], &m); - - ret =spi_sync (st->us, &m); + ret =spi_sync_transfer (st->us, t,ARRAY_SIZE (t));if (ret ==0 ) *val =sign_extend32 (be16_to_cpu (st->buf),11 );
PATCH 3/8 iio:adxrs450: Use spi_sync_transfer()
In reply to Lars-Peter ClausenUse the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/iio/gyro/adxrs450.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/iio/gyro/adxrs450.c +2 -10
@@ -90,7 +90,6 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,u8 reg_address, u16 *val) { - struct spi_message msg; struct adxrs450_state *st = iio_priv(indio_dev);u32 tx;int ret;
@@ -114,10 +113,7 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev, tx |=ADXRS450_P ; st->tx =cpu_to_be32 (tx); -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 while reading 16 bit register 0x%02x\n" , reg_address);
@@ -169,7 +165,6 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,**/ static int adxrs450_spi_sensor_data (struct iio_dev *indio_dev,s16 *val) { -struct spi_message msg;struct adxrs450_state *st =iio_priv (indio_dev);int ret;struct spi_transfer xfers[] = {
@@ -188,10 +183,7 @@ static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)mutex_lock (&st->buf_lock); st->tx =cpu_to_be32 (ADXRS450_SENSOR_DATA ); -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 while reading sensor data\n" ); goto error_ret;
Signature · 1 line
1.8.0
Re: [PATCH 3/8] iio:adxrs450: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied to the togreg branch of iio.git
Thanks,
Quoted 49 lines
--- drivers/iio/gyro/adxrs450.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)drivers/iio/gyro/adxrs450.c +2
-10@@ -90,7 +90,6 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,u8 reg_address, u16 *val) { - struct spi_message msg; struct adxrs450_state *st = iio_priv(indio_dev);u32 tx;int ret;@@ -114,10 +113,7 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev, tx |=ADXRS450_P ; st->tx =cpu_to_be32 (tx); -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 while reading 16 bit register 0x%02x\n" , reg_address);@@ -169,7 +165,6 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,**/ static int adxrs450_spi_sensor_data (struct iio_dev *indio_dev,s16 *val) { -struct spi_message msg;struct adxrs450_state *st =iio_priv (indio_dev);int ret;struct spi_transfer xfers[] = {@@ -188,10 +183,7 @@ static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)mutex_lock (&st->buf_lock); st->tx =cpu_to_be32 (ADXRS450_SENSOR_DATA ); -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 while reading sensor data\n" ); goto error_ret;
PATCH 4/8 iio:adis16130: Use spi_sync_transfer()
In reply to Lars-Peter ClausenUse the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/iio/gyro/adis16130.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/iio/gyro/adis16130.c +1 -5
@@ -47,7 +47,6 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) {int ret;struct adis16130_state *st =iio_priv (indio_dev); -struct spi_message msg;struct spi_transfer xfer = { .tx_buf = st->buf, .rx_buf = st->buf,
@@ -59,10 +58,7 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) st->buf[0 ] =ADIS16130_CON_RD | reg_addr; st->buf[1 ] = st->buf[2 ] = st->buf[3 ] =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 );if (ret ==0 ) *val = (st->buf[1 ] <<16 ) | (st->buf[2 ] <<8 ) | st->buf[3 ];mutex_unlock (&st->buf_lock);
Signature · 1 line
1.8.0
Re: [PATCH 4/8] iio:adis16130: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied to the togreg branch of iio.git
thanks,
Quoted 29 lines
--- drivers/iio/gyro/adis16130.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/iio/gyro/adis16130.c +1
-5@@ -47,7 +47,6 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) {int ret;struct adis16130_state *st =iio_priv (indio_dev); -struct spi_message msg;struct spi_transfer xfer = { .tx_buf = st->buf, .rx_buf = st->buf,@@ -59,10 +58,7 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) st->buf[0 ] =ADIS16130_CON_RD | reg_addr; st->buf[1 ] = st->buf[2 ] = st->buf[3 ] =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 );if (ret ==0 ) *val = (st->buf[1 ] <<16 ) | (st->buf[2 ] <<8 ) | st->buf[3 ];mutex_unlock (&st->buf_lock);
Re: [PATCH 4/8] iio:adis16130: Use spi_sync_transfer()
In reply to Lars-Peter ClausenQuoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied to the togreg branch of iio.git
Thanks,
Quoted 29 lines
--- drivers/iio/gyro/adis16130.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/iio/gyro/adis16130.c +1
-5@@ -47,7 +47,6 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) {int ret;struct adis16130_state *st =iio_priv (indio_dev); -struct spi_message msg;struct spi_transfer xfer = { .tx_buf = st->buf, .rx_buf = st->buf,@@ -59,10 +58,7 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val) st->buf[0 ] =ADIS16130_CON_RD | reg_addr; st->buf[1 ] = st->buf[2 ] = st->buf[3 ] =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 );if (ret ==0 ) *val = (st->buf[1 ] <<16 ) | (st->buf[2 ] <<8 ) | st->buf[3 ];mutex_unlock (&st->buf_lock);
PATCH 5/8 staging:iio:adis16220: Use spi_sync_transfer()
In reply to Lars-Peter ClausenUse the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/staging/iio/accel/adis16220_core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/staging/iio/accel/adis16220_core.c +1 -5
@@ -102,7 +102,6 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev, int addr) {struct adis16220_state *st =iio_priv (indio_dev); -struct spi_message msg;struct spi_transfer xfers[] = { { .tx_buf = st->tx,
@@ -147,10 +146,7 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev, } xfers[1 ].len = count; -spi_message_init (&msg); -spi_message_add_tail (&xfers[0 ], &msg); -spi_message_add_tail (&xfers[1 ], &msg); - ret =spi_sync (st->adis.spi, &msg); + ret =spi_sync_transfer (st->adis.spi, xfers,ARRAY_SIZE (xfers));if (ret) {mutex_unlock (&st->buf_lock);
Signature · 1 line
1.8.0
Re: [PATCH 5/8] staging:iio:adis16220: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied
Quoted 29 lines
--- drivers/staging/iio/accel/adis16220_core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/staging/iio/accel/adis16220_core.c +1
-5@@ -102,7 +102,6 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev, int addr) {struct adis16220_state *st =iio_priv (indio_dev); -struct spi_message msg;struct spi_transfer xfers[] = { { .tx_buf = st->tx,@@ -147,10 +146,7 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev, } xfers[1 ].len = count; -spi_message_init (&msg); -spi_message_add_tail (&xfers[0 ], &msg); -spi_message_add_tail (&xfers[1 ], &msg); - ret =spi_sync (st->adis.spi, &msg); + ret =spi_sync_transfer (st->adis.spi, xfers,ARRAY_SIZE (xfers));if (ret) {mutex_unlock (&st->buf_lock);
PATCH 6/8 staging:iio:ad9852: Use spi_sync_transfer()
In reply to Lars-Peter ClausenUse the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/staging/iio/frequency/ad9852.c | 45 +++++++++------------------------- 1 file changed, 11 insertions(+), 34 deletions(-)
drivers/staging/iio/frequency/ad9852.c +11 -34
@@ -67,7 +67,6 @@ static ssize_t ad9852_set_parameter(struct device *dev, const char *buf, size_t len) { -struct spi_message msg;struct spi_transfer xfer;int ret;struct ad9852_config *config = (struct ad9852_config *)buf;
@@ -78,99 +77,77 @@ static ssize_t ad9852_set_parameter(struct device *dev, xfer.tx_buf = &config->phajst0[0 ];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; xfer.len =3 ; xfer.tx_buf = &config->phajst1[0 ]; -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; xfer.len =6 ; xfer.tx_buf = &config->fretun1[0 ]; -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; xfer.len =6 ; xfer.tx_buf = &config->fretun2[0 ]; -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; xfer.len =6 ; xfer.tx_buf = &config->dltafre[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->updtclk[0 ]; -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; xfer.len =4 ; xfer.tx_buf = &config->ramprat[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->control[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->outpskm[0 ]; -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; xfer.len =2 ; xfer.tx_buf = &config->outpskr[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->daccntl[0 ]; -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:
Signature · 1 line
1.8.0
Re: [PATCH 6/8] staging:iio:ad9852: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
applied.
Quoted 128 lines
--- drivers/staging/iio/frequency/ad9852.c | 45 +++++++++------------------------- 1 file changed, 11 insertions(+), 34 deletions(-)drivers/staging/iio/frequency/ad9852.c +11
-34@@ -67,7 +67,6 @@ static ssize_t ad9852_set_parameter(struct device *dev, const char *buf, size_t len) { -struct spi_message msg;struct spi_transfer xfer;int ret;struct ad9852_config *config = (struct ad9852_config *)buf;@@ -78,99 +77,77 @@ static ssize_t ad9852_set_parameter(struct device *dev, xfer.tx_buf = &config->phajst0[0 ];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; xfer.len =3 ; xfer.tx_buf = &config->phajst1[0 ]; -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; xfer.len =6 ; xfer.tx_buf = &config->fretun1[0 ]; -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; xfer.len =6 ; xfer.tx_buf = &config->fretun2[0 ]; -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; xfer.len =6 ; xfer.tx_buf = &config->dltafre[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->updtclk[0 ]; -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; xfer.len =4 ; xfer.tx_buf = &config->ramprat[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->control[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->outpskm[0 ]; -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; xfer.len =2 ; xfer.tx_buf = &config->outpskr[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->daccntl[0 ]; -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:
PATCH 7/8 staging:iio:ad9910: Use spi_sync_transfer()
In reply to Lars-Peter ClausenUse the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/staging/iio/frequency/ad9910.c | 82 +++++++++------------------------- 1 file changed, 20 insertions(+), 62 deletions(-)
drivers/staging/iio/frequency/ad9910.c +20 -62
@@ -119,7 +119,6 @@ static ssize_t ad9910_set_parameter(struct device *dev, const char *buf, size_t len) { -struct spi_message msg;struct spi_transfer xfer;int ret;struct ad9910_config *config = (struct ad9910_config *)buf;
@@ -130,152 +129,118 @@ static ssize_t ad9910_set_parameter(struct device *dev, xfer.tx_buf = &config->auxdac[0 ];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; xfer.len =5 ; xfer.tx_buf = &config->ioupd[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->ftw[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->pow[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->asf[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->multc[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->dig_rampl[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->dig_ramps[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->dig_rampr[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep0[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep1[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep2[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep3[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep4[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep5[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep6[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep7[0 ]; -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:
@@ -288,7 +253,6 @@ static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9910_set_parameter, 0);static void ad9910_init (struct ad9910_state *st) { -struct spi_message msg;struct spi_transfer xfer;int ret;u8 cfr[5 ];
@@ -304,9 +268,7 @@ static void ad9910_init(struct ad9910_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;
@@ -319,9 +281,7 @@ static void ad9910_init(struct ad9910_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;
@@ -334,9 +294,7 @@ static void ad9910_init(struct ad9910_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;
Signature · 1 line
1.8.0
Re: [PATCH 7/8] staging:iio:ad9910: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied.
Quoted 228 lines
--- drivers/staging/iio/frequency/ad9910.c | 82 +++++++++------------------------- 1 file changed, 20 insertions(+), 62 deletions(-)drivers/staging/iio/frequency/ad9910.c +20
-62@@ -119,7 +119,6 @@ static ssize_t ad9910_set_parameter(struct device *dev, const char *buf, size_t len) { -struct spi_message msg;struct spi_transfer xfer;int ret;struct ad9910_config *config = (struct ad9910_config *)buf;@@ -130,152 +129,118 @@ static ssize_t ad9910_set_parameter(struct device *dev, xfer.tx_buf = &config->auxdac[0 ];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; xfer.len =5 ; xfer.tx_buf = &config->ioupd[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->ftw[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->pow[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->asf[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->multc[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->dig_rampl[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->dig_ramps[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->dig_rampr[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep0[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep1[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep2[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep3[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep4[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep5[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep6[0 ]; -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; xfer.len =9 ; xfer.tx_buf = &config->sin_tonep7[0 ]; -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:@@ -288,7 +253,6 @@ static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9910_set_parameter, 0);static void ad9910_init (struct ad9910_state *st) { -struct spi_message msg;struct spi_transfer xfer;int ret;u8 cfr[5 ];@@ -304,9 +268,7 @@ static void ad9910_init(struct ad9910_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;@@ -319,9 +281,7 @@ static void ad9910_init(struct ad9910_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;@@ -334,9 +294,7 @@ static void ad9910_init(struct ad9910_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;
PATCH 8/8 staging:iio:ad9951: Use spi_sync_transfer()
In reply to Lars-Peter ClausenUse the spi_sync_transfer() helper function instead of open-coding it. Makes the code a bit shorter.
--- drivers/staging/iio/frequency/ad9951.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-)
drivers/staging/iio/frequency/ad9951.c +6 -20
@@ -60,7 +60,6 @@ static ssize_t ad9951_set_parameter(struct device *dev, const char *buf, size_t len) { -struct spi_message msg;struct spi_transfer xfer;int ret;struct ad9951_config *config = (struct ad9951_config *)buf;
@@ -71,36 +70,28 @@ static ssize_t ad9951_set_parameter(struct device *dev, xfer.tx_buf = &config->asf[0 ];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; xfer.len =2 ; xfer.tx_buf = &config->arr[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->ftw0[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->ftw1[0 ]; -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:
@@ -113,7 +104,6 @@ static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9951_set_parameter, 0);static void ad9951_init (struct ad9951_state *st) { -struct spi_message msg;struct spi_transfer xfer;int ret;u8 cfr[5 ];
@@ -129,9 +119,7 @@ static void ad9951_init(struct ad9951_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;
@@ -143,9 +131,7 @@ static void ad9951_init(struct ad9951_state *st) xfer.len =4 ; xfer.tx_buf = 𝔠 -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;
Signature · 1 line
1.8.0
Re: [PATCH 8/8] staging:iio:ad9951: Use spi_sync_transfer()
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied. Thanks,
Quoted 88 lines
--- drivers/staging/iio/frequency/ad9951.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-)drivers/staging/iio/frequency/ad9951.c +6
-20@@ -60,7 +60,6 @@ static ssize_t ad9951_set_parameter(struct device *dev, const char *buf, size_t len) { -struct spi_message msg;struct spi_transfer xfer;int ret;struct ad9951_config *config = (struct ad9951_config *)buf;@@ -71,36 +70,28 @@ static ssize_t ad9951_set_parameter(struct device *dev, xfer.tx_buf = &config->asf[0 ];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; xfer.len =2 ; xfer.tx_buf = &config->arr[0 ]; -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; xfer.len =5 ; xfer.tx_buf = &config->ftw0[0 ]; -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; xfer.len =3 ; xfer.tx_buf = &config->ftw1[0 ]; -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:@@ -113,7 +104,6 @@ static IIO_DEVICE_ATTR(dds, S_IWUSR, NULL, ad9951_set_parameter, 0);static void ad9951_init (struct ad9951_state *st) { -struct spi_message msg;struct spi_transfer xfer;int ret;u8 cfr[5 ];@@ -129,9 +119,7 @@ static void ad9951_init(struct ad9951_state *st) xfer.len =5 ; xfer.tx_buf = 𝔠 -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;@@ -143,9 +131,7 @@ static void ad9951_init(struct ad9951_state *st) xfer.len =4 ; xfer.tx_buf = 𝔠 -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;
Quoted 4 lines · Lars-Peter Clausen
Use the
spi_sync_transfer()helper function instead of open-coding it. Makes the code a bit shorter.Signed-off-by Lars-Peter Clausen <[email protected]>
Applied to the togreg branch of iio.git
Thanks,
Quoted 34 lines
--- drivers/iio/dac/ad5449.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)drivers/iio/dac/ad5449.c +1
-6@@ -101,7 +101,6 @@ static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr, {struct ad5449 *st =iio_priv (indio_dev);int ret; -struct spi_message msg;struct spi_transfer t[] = { { .tx_buf = &st->data[0 ],@@ -114,15 +113,11 @@ static int ad5449_read(struct iio_dev *indio_dev, unsigned int addr, }, }; -spi_message_init (&msg); -spi_message_add_tail (&t[0 ], &msg); -spi_message_add_tail (&t[1 ], &msg); -mutex_lock (&indio_dev->mlock); st->data[0 ] =cpu_to_be16 (addr <<12 ); st->data[1 ] =cpu_to_be16 (AD5449_CMD_NOOP ); - ret =spi_sync (st->spi, &msg); + ret =spi_sync_transfer (st->spi, t,ARRAY_SIZE (t));if (ret <0 ) goto out_unlock;