| Message ID | 20211205202710.2847005-5-jic23@kernel.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | iio:adc:ad7280a Cleanup and proposed staging graduation. | expand |
On 12/05, Jonathan Cameron wrote: > From: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > As the __cacheline_aligned will ensure that the first of these two buffers > is appropriate aligned, there is no need to keep them as a single array > which is confusing given the first element is always tx and the second > rx. Hence let us just have two parts and name them separately. > > Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Marcelo Schmitt <marcelo.schmitt1@gmail.com> > --- > drivers/staging/iio/adc/ad7280a.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c > index 4d866e5fe43c..1f7ea5fb1e20 100644 > --- a/drivers/staging/iio/adc/ad7280a.c > +++ b/drivers/staging/iio/adc/ad7280a.c > @@ -153,7 +153,8 @@ struct ad7280_state { > unsigned char cb_mask[AD7280A_MAX_CHAIN]; > struct mutex lock; /* protect sensor state */ > > - __be32 buf[2] ____cacheline_aligned; > + __be32 tx ____cacheline_aligned; > + __be32 rx; > }; > > static unsigned char ad7280_calc_crc8(unsigned char *crc_tab, unsigned int val) > @@ -196,18 +197,18 @@ static int __ad7280_read32(struct ad7280_state *st, unsigned int *val) > { > int ret; > struct spi_transfer t = { > - .tx_buf = &st->buf[0], > - .rx_buf = &st->buf[1], > - .len = 4, > + .tx_buf = &st->tx, > + .rx_buf = &st->rx, > + .len = sizeof(st->tx), > }; > > - st->buf[0] = cpu_to_be32(AD7280A_READ_TXVAL); > + st->tx = cpu_to_be32(AD7280A_READ_TXVAL); > > ret = spi_sync_transfer(st->spi, &t, 1); > if (ret) > return ret; > > - *val = be32_to_cpu(st->buf[1]); > + *val = be32_to_cpu(st->rx); > > return 0; > } > @@ -219,9 +220,9 @@ static int ad7280_write(struct ad7280_state *st, unsigned int devaddr, > (val & 0xFF) << 13 | all << 12; > > reg |= ad7280_calc_crc8(st->crc_tab, reg >> 11) << 3 | 0x2; > - st->buf[0] = cpu_to_be32(reg); > + st->tx = cpu_to_be32(reg); > > - return spi_write(st->spi, &st->buf[0], 4); > + return spi_write(st->spi, &st->tx, sizeof(st->tx)); > } > > static int ad7280_read_reg(struct ad7280_state *st, unsigned int devaddr, > -- > 2.34.1 >
diff --git a/drivers/staging/iio/adc/ad7280a.c b/drivers/staging/iio/adc/ad7280a.c index 4d866e5fe43c..1f7ea5fb1e20 100644 --- a/drivers/staging/iio/adc/ad7280a.c +++ b/drivers/staging/iio/adc/ad7280a.c @@ -153,7 +153,8 @@ struct ad7280_state { unsigned char cb_mask[AD7280A_MAX_CHAIN]; struct mutex lock; /* protect sensor state */ - __be32 buf[2] ____cacheline_aligned; + __be32 tx ____cacheline_aligned; + __be32 rx; }; static unsigned char ad7280_calc_crc8(unsigned char *crc_tab, unsigned int val) @@ -196,18 +197,18 @@ static int __ad7280_read32(struct ad7280_state *st, unsigned int *val) { int ret; struct spi_transfer t = { - .tx_buf = &st->buf[0], - .rx_buf = &st->buf[1], - .len = 4, + .tx_buf = &st->tx, + .rx_buf = &st->rx, + .len = sizeof(st->tx), }; - st->buf[0] = cpu_to_be32(AD7280A_READ_TXVAL); + st->tx = cpu_to_be32(AD7280A_READ_TXVAL); ret = spi_sync_transfer(st->spi, &t, 1); if (ret) return ret; - *val = be32_to_cpu(st->buf[1]); + *val = be32_to_cpu(st->rx); return 0; } @@ -219,9 +220,9 @@ static int ad7280_write(struct ad7280_state *st, unsigned int devaddr, (val & 0xFF) << 13 | all << 12; reg |= ad7280_calc_crc8(st->crc_tab, reg >> 11) << 3 | 0x2; - st->buf[0] = cpu_to_be32(reg); + st->tx = cpu_to_be32(reg); - return spi_write(st->spi, &st->buf[0], 4); + return spi_write(st->spi, &st->tx, sizeof(st->tx)); } static int ad7280_read_reg(struct ad7280_state *st, unsigned int devaddr,