diff options
author | Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com> | 2018-03-23 11:27:27 -0300 |
---|---|---|
committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2018-03-24 13:28:05 +0000 |
commit | 8ea0fa7cd425448e24da38dfe4ea78d3aa69b48c (patch) | |
tree | 4bf868e931ccb20bea45d1f970de78aedd0ada86 /drivers/staging/iio/meter/ade7854-i2c.c | |
parent | staging:iio:ade7854: Rework SPI read function (diff) | |
download | linux-dev-8ea0fa7cd425448e24da38dfe4ea78d3aa69b48c.tar.xz linux-dev-8ea0fa7cd425448e24da38dfe4ea78d3aa69b48c.zip |
staging:iio:ade7854: Remove read_reg_* duplications
The original code had a read function per data size; after updates, all
read functions tasks were centralized in a single function, but the old
signature was kept to maintain the module working without problems. This
patch removes a set of duplications associated with read_reg_*, and
update the areas that calling the old interface by the new one.
Signed-off-by: Rodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers/staging/iio/meter/ade7854-i2c.c')
-rw-r--r-- | drivers/staging/iio/meter/ade7854-i2c.c | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/drivers/staging/iio/meter/ade7854-i2c.c b/drivers/staging/iio/meter/ade7854-i2c.c index 63793f9664c7..c3aa6ea9d036 100644 --- a/drivers/staging/iio/meter/ade7854-i2c.c +++ b/drivers/staging/iio/meter/ade7854-i2c.c @@ -110,34 +110,6 @@ unlock: return ret; } -static int ade7854_i2c_read_reg_8(struct device *dev, - u16 reg_address, - u8 *val) -{ - return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 8); -} - -static int ade7854_i2c_read_reg_16(struct device *dev, - u16 reg_address, - u16 *val) -{ - return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 16); -} - -static int ade7854_i2c_read_reg_24(struct device *dev, - u16 reg_address, - u32 *val) -{ - return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 24); -} - -static int ade7854_i2c_read_reg_32(struct device *dev, - u16 reg_address, - u32 *val) -{ - return ade7854_i2c_read_reg(dev, reg_address, (u32 *)val, 32); -} - static int ade7854_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { @@ -149,10 +121,7 @@ static int ade7854_i2c_probe(struct i2c_client *client, return -ENOMEM; st = iio_priv(indio_dev); i2c_set_clientdata(client, indio_dev); - st->read_reg_8 = ade7854_i2c_read_reg_8; - st->read_reg_16 = ade7854_i2c_read_reg_16; - st->read_reg_24 = ade7854_i2c_read_reg_24; - st->read_reg_32 = ade7854_i2c_read_reg_32; + st->read_reg = ade7854_i2c_read_reg; st->write_reg = ade7854_i2c_write_reg; st->i2c = client; st->irq = client->irq; |