@@ -198,26 +198,22 @@ static const struct bin_attribute ds1682_eeprom_attr = {
.write = ds1682_eeprom_write,
};
-static int ds1682_nvmem_read(void *priv, unsigned int offset, void *val,
- size_t bytes)
+static ssize_t ds1682_nvmem_read(void *priv, unsigned int offset, void *val,
+ size_t bytes)
{
struct i2c_client *client = priv;
- int ret;
- ret = i2c_smbus_read_i2c_block_data(client, DS1682_REG_EEPROM + offset,
+ return i2c_smbus_read_i2c_block_data(client, DS1682_REG_EEPROM + offset,
bytes, val);
- return ret < 0 ? ret : 0;
}
-static int ds1682_nvmem_write(void *priv, unsigned int offset, void *val,
- size_t bytes)
+static ssize_t ds1682_nvmem_write(void *priv, unsigned int offset, void *val,
+ size_t bytes)
{
struct i2c_client *client = priv;
- int ret;
- ret = i2c_smbus_write_i2c_block_data(client, DS1682_REG_EEPROM + offset,
+ return i2c_smbus_write_i2c_block_data(client, DS1682_REG_EEPROM + offset,
bytes, val);
- return ret < 0 ? ret : 0;
}
/*
Change nvmem read/write function definition return type to ssize_t. Signed-off-by: Joy Chakraborty <joychakr@google.com> --- drivers/misc/ds1682.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)