[PATCH v1 04/17] iio: pressure: bmp280: Change nvmem reg_read/write return type

From: Joy Chakraborty
Date: Wed Jun 05 2024 - 14:01:57 EST


Change nvmem read/write function definition return type to ssize_t.

Signed-off-by: Joy Chakraborty <joychakr@xxxxxxxxxx>
---
drivers/iio/pressure/bmp280-core.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 09f53d987c7d..8d5aeabfa297 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -1465,10 +1465,11 @@ static const int bmp580_odr_table[][2] = {

static const int bmp580_nvmem_addrs[] = { 0x20, 0x21, 0x22 };

-static int bmp580_nvmem_read(void *priv, unsigned int offset, void *val,
- size_t bytes)
+static ssize_t bmp580_nvmem_read(void *priv, unsigned int offset, void *val,
+ size_t bytes)
{
struct bmp280_data *data = priv;
+ size_t bytes_read = bytes;
u16 *dst = val;
int ret, addr;

@@ -1518,13 +1519,14 @@ static int bmp580_nvmem_read(void *priv, unsigned int offset, void *val,
mutex_unlock(&data->lock);
pm_runtime_mark_last_busy(data->dev);
pm_runtime_put_autosuspend(data->dev);
- return ret;
+ return ret < 0 ? ret : bytes_read;
}

-static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
- size_t bytes)
+static ssize_t bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
+ size_t bytes)
{
struct bmp280_data *data = priv;
+ size_t bytes_written = bytes;
u16 *buf = val;
int ret, addr;

@@ -1582,7 +1584,7 @@ static int bmp580_nvmem_write(void *priv, unsigned int offset, void *val,
mutex_unlock(&data->lock);
pm_runtime_mark_last_busy(data->dev);
pm_runtime_put_autosuspend(data->dev);
- return ret;
+ return ret < 0 ? ret : bytes_written;
}

static int bmp580_preinit(struct bmp280_data *data)
--
2.45.1.467.gbab1589fc0-goog