iio: pressure: mprls0025pa: rename buffer variable

For the reason of better naming consistency rename priv->buffer into
priv->rx_buf since tx_buf will get introduced in the next patch.

Signed-off-by: Petre Rodan <petre.rodan@subdimension.ro>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/drivers/iio/pressure/mprls0025pa.c b/drivers/iio/pressure/mprls0025pa.c
index 3a5dbec81b502ff9528ea900a59a82ee1a1de1f6..245d7ed82b6bfe7501ba78794fca894c0cda3ad0 100644 (file)
--- a/drivers/iio/pressure/mprls0025pa.c
+++ b/drivers/iio/pressure/mprls0025pa.c
@@ -238,7 +238,7 @@ static int mpr_read_pressure(struct mpr_data *data, s32 *press)
                                        ret);
                                return ret;
                        }
-                       if (!(data->buffer[0] & MPR_ST_ERR_FLAG))
+                       if (!(data->rx_buf[0] & MPR_ST_ERR_FLAG))
                                break;
                }
                if (i == nloops) {
@@ -251,15 +251,15 @@ static int mpr_read_pressure(struct mpr_data *data, s32 *press)
        if (ret < 0)
                return ret;
 
-       if (data->buffer[0] & MPR_ST_ERR_FLAG) {
+       if (data->rx_buf[0] & MPR_ST_ERR_FLAG) {
                dev_err(data->dev,
-                       "unexpected status byte %02x\n", data->buffer[0]);
+                       "unexpected status byte %02x\n", data->rx_buf[0]);
                return -ETIMEDOUT;
        }
 
-       *press = get_unaligned_be24(&data->buffer[1]);
+       *press = get_unaligned_be24(&data->rx_buf[1]);
 
-       dev_dbg(dev, "received: %*ph cnt: %d\n", ret, data->buffer, *press);
+       dev_dbg(dev, "received: %*ph cnt: %d\n", ret, data->rx_buf, *press);
 
        return 0;
 }

diff --git a/drivers/iio/pressure/mprls0025pa.h b/drivers/iio/pressure/mprls0025pa.h
index e34253af8e23bc2e5cf6084cddd3631c0188bea2..119ebb0ba567ee5570822a01572dcde7ae2cb46b 100644 (file)
--- a/drivers/iio/pressure/mprls0025pa.h
+++ b/drivers/iio/pressure/mprls0025pa.h
@@ -54,7 +54,7 @@ enum mpr_func_id {
  * @chan: channel values for buffered mode
  * @chan.pres: pressure value
  * @chan.ts: timestamp
- * @buffer: raw conversion data
+ * @rx_buf: raw conversion data
  */
 struct mpr_data {
        struct device           *dev;
@@ -75,7 +75,7 @@ struct mpr_data {
                s32 pres;
                aligned_s64 ts;
        } chan;
-       u8          buffer[MPR_MEASUREMENT_RD_SIZE] __aligned(IIO_DMA_MINALIGN);
+       u8 rx_buf[MPR_MEASUREMENT_RD_SIZE] __aligned(IIO_DMA_MINALIGN);
 };
 
 struct mpr_ops {

diff --git a/drivers/iio/pressure/mprls0025pa_i2c.c b/drivers/iio/pressure/mprls0025pa_i2c.c
index 79811fd4a02b370b3fde8bd67a5115a3934f8614..36da0059b19fccf55f1b8bfe7f4ea0ee9a1ce7b1 100644 (file)
--- a/drivers/iio/pressure/mprls0025pa_i2c.c
+++ b/drivers/iio/pressure/mprls0025pa_i2c.c
@@ -30,8 +30,8 @@ static int mpr_i2c_read(struct mpr_data *data, const u8 unused, const u8 cnt)
        if (cnt > MPR_MEASUREMENT_RD_SIZE)
                return -EOVERFLOW;
 
-       memset(data->buffer, 0, MPR_MEASUREMENT_RD_SIZE);
-       ret = i2c_master_recv(client, data->buffer, cnt);
+       memset(data->rx_buf, 0, MPR_MEASUREMENT_RD_SIZE);
+       ret = i2c_master_recv(client, data->rx_buf, cnt);
        if (ret < 0)
                return ret;
        else if (ret != cnt)

diff --git a/drivers/iio/pressure/mprls0025pa_spi.c b/drivers/iio/pressure/mprls0025pa_spi.c
index cf17eb2e720830930a3e275579ca5a3da8bb5c82..247b65226bb9e942e34f1bd5e7e2b94ca06a7338 100644 (file)
--- a/drivers/iio/pressure/mprls0025pa_spi.c
+++ b/drivers/iio/pressure/mprls0025pa_spi.c
@@ -56,7 +56,7 @@ static int mpr_spi_xfer(struct mpr_data *data, const u8 cmd, const u8 pkt_len)
        xfers[0].delay.unit = SPI_DELAY_UNIT_NSECS;
 
        xfers[1].tx_buf = buf->tx;
-       xfers[1].rx_buf = data->buffer;
+       xfers[1].rx_buf = data->rx_buf;
        xfers[1].len = pkt_len;
 
        return spi_sync_transfer(spi, xfers, ARRAY_SIZE(xfers));