Commit 6de543e3 authored by Rodrigo Siqueira's avatar Rodrigo Siqueira Committed by Jonathan Cameron

staging:iio:meter: Add name to function definition arguments

This patch fixes the checkpatch.pl warning:

drivers/staging/iio/meter/ade7854.h:157: WARNING: function definition
argument 'struct device *' should also have an identifier name...

This commit adds arguments names to the signature declared in the
ade7854_state struct. For consistency reason, It also renames all
arguments in function definitions.
Signed-off-by: default avatarRodrigo Siqueira <rodrigosiqueiramelo@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent c50fadef
...@@ -132,7 +132,7 @@ static int ade7754_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val) ...@@ -132,7 +132,7 @@ static int ade7754_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val)
} }
static int ade7754_spi_write_reg_16(struct device *dev, static int ade7754_spi_write_reg_16(struct device *dev,
u8 reg_address, u16 value) u8 reg_address, u16 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -140,8 +140,8 @@ static int ade7754_spi_write_reg_16(struct device *dev, ...@@ -140,8 +140,8 @@ static int ade7754_spi_write_reg_16(struct device *dev,
mutex_lock(&st->buf_lock); mutex_lock(&st->buf_lock);
st->tx[0] = ADE7754_WRITE_REG(reg_address); st->tx[0] = ADE7754_WRITE_REG(reg_address);
st->tx[1] = (value >> 8) & 0xFF; st->tx[1] = (val >> 8) & 0xFF;
st->tx[2] = value & 0xFF; st->tx[2] = val & 0xFF;
ret = spi_write(st->us, st->tx, 3); ret = spi_write(st->us, st->tx, 3);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
static int ade7854_i2c_write_reg_8(struct device *dev, static int ade7854_i2c_write_reg_8(struct device *dev,
u16 reg_address, u16 reg_address,
u8 value) u8 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -26,7 +26,7 @@ static int ade7854_i2c_write_reg_8(struct device *dev, ...@@ -26,7 +26,7 @@ static int ade7854_i2c_write_reg_8(struct device *dev,
mutex_lock(&st->buf_lock); mutex_lock(&st->buf_lock);
st->tx[0] = (reg_address >> 8) & 0xFF; st->tx[0] = (reg_address >> 8) & 0xFF;
st->tx[1] = reg_address & 0xFF; st->tx[1] = reg_address & 0xFF;
st->tx[2] = value; st->tx[2] = val;
ret = i2c_master_send(st->i2c, st->tx, 3); ret = i2c_master_send(st->i2c, st->tx, 3);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
...@@ -36,7 +36,7 @@ static int ade7854_i2c_write_reg_8(struct device *dev, ...@@ -36,7 +36,7 @@ static int ade7854_i2c_write_reg_8(struct device *dev,
static int ade7854_i2c_write_reg_16(struct device *dev, static int ade7854_i2c_write_reg_16(struct device *dev,
u16 reg_address, u16 reg_address,
u16 value) u16 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -45,8 +45,8 @@ static int ade7854_i2c_write_reg_16(struct device *dev, ...@@ -45,8 +45,8 @@ static int ade7854_i2c_write_reg_16(struct device *dev,
mutex_lock(&st->buf_lock); mutex_lock(&st->buf_lock);
st->tx[0] = (reg_address >> 8) & 0xFF; st->tx[0] = (reg_address >> 8) & 0xFF;
st->tx[1] = reg_address & 0xFF; st->tx[1] = reg_address & 0xFF;
st->tx[2] = (value >> 8) & 0xFF; st->tx[2] = (val >> 8) & 0xFF;
st->tx[3] = value & 0xFF; st->tx[3] = val & 0xFF;
ret = i2c_master_send(st->i2c, st->tx, 4); ret = i2c_master_send(st->i2c, st->tx, 4);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
...@@ -56,7 +56,7 @@ static int ade7854_i2c_write_reg_16(struct device *dev, ...@@ -56,7 +56,7 @@ static int ade7854_i2c_write_reg_16(struct device *dev,
static int ade7854_i2c_write_reg_24(struct device *dev, static int ade7854_i2c_write_reg_24(struct device *dev,
u16 reg_address, u16 reg_address,
u32 value) u32 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -65,9 +65,9 @@ static int ade7854_i2c_write_reg_24(struct device *dev, ...@@ -65,9 +65,9 @@ static int ade7854_i2c_write_reg_24(struct device *dev,
mutex_lock(&st->buf_lock); mutex_lock(&st->buf_lock);
st->tx[0] = (reg_address >> 8) & 0xFF; st->tx[0] = (reg_address >> 8) & 0xFF;
st->tx[1] = reg_address & 0xFF; st->tx[1] = reg_address & 0xFF;
st->tx[2] = (value >> 16) & 0xFF; st->tx[2] = (val >> 16) & 0xFF;
st->tx[3] = (value >> 8) & 0xFF; st->tx[3] = (val >> 8) & 0xFF;
st->tx[4] = value & 0xFF; st->tx[4] = val & 0xFF;
ret = i2c_master_send(st->i2c, st->tx, 5); ret = i2c_master_send(st->i2c, st->tx, 5);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
...@@ -77,7 +77,7 @@ static int ade7854_i2c_write_reg_24(struct device *dev, ...@@ -77,7 +77,7 @@ static int ade7854_i2c_write_reg_24(struct device *dev,
static int ade7854_i2c_write_reg_32(struct device *dev, static int ade7854_i2c_write_reg_32(struct device *dev,
u16 reg_address, u16 reg_address,
u32 value) u32 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -86,10 +86,10 @@ static int ade7854_i2c_write_reg_32(struct device *dev, ...@@ -86,10 +86,10 @@ static int ade7854_i2c_write_reg_32(struct device *dev,
mutex_lock(&st->buf_lock); mutex_lock(&st->buf_lock);
st->tx[0] = (reg_address >> 8) & 0xFF; st->tx[0] = (reg_address >> 8) & 0xFF;
st->tx[1] = reg_address & 0xFF; st->tx[1] = reg_address & 0xFF;
st->tx[2] = (value >> 24) & 0xFF; st->tx[2] = (val >> 24) & 0xFF;
st->tx[3] = (value >> 16) & 0xFF; st->tx[3] = (val >> 16) & 0xFF;
st->tx[4] = (value >> 8) & 0xFF; st->tx[4] = (val >> 8) & 0xFF;
st->tx[5] = value & 0xFF; st->tx[5] = val & 0xFF;
ret = i2c_master_send(st->i2c, st->tx, 6); ret = i2c_master_send(st->i2c, st->tx, 6);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
static int ade7854_spi_write_reg_8(struct device *dev, static int ade7854_spi_write_reg_8(struct device *dev,
u16 reg_address, u16 reg_address,
u8 value) u8 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -32,7 +32,7 @@ static int ade7854_spi_write_reg_8(struct device *dev, ...@@ -32,7 +32,7 @@ static int ade7854_spi_write_reg_8(struct device *dev,
st->tx[0] = ADE7854_WRITE_REG; st->tx[0] = ADE7854_WRITE_REG;
st->tx[1] = (reg_address >> 8) & 0xFF; st->tx[1] = (reg_address >> 8) & 0xFF;
st->tx[2] = reg_address & 0xFF; st->tx[2] = reg_address & 0xFF;
st->tx[3] = value & 0xFF; st->tx[3] = val & 0xFF;
ret = spi_sync_transfer(st->spi, &xfer, 1); ret = spi_sync_transfer(st->spi, &xfer, 1);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
...@@ -42,7 +42,7 @@ static int ade7854_spi_write_reg_8(struct device *dev, ...@@ -42,7 +42,7 @@ static int ade7854_spi_write_reg_8(struct device *dev,
static int ade7854_spi_write_reg_16(struct device *dev, static int ade7854_spi_write_reg_16(struct device *dev,
u16 reg_address, u16 reg_address,
u16 value) u16 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -57,8 +57,8 @@ static int ade7854_spi_write_reg_16(struct device *dev, ...@@ -57,8 +57,8 @@ static int ade7854_spi_write_reg_16(struct device *dev,
st->tx[0] = ADE7854_WRITE_REG; st->tx[0] = ADE7854_WRITE_REG;
st->tx[1] = (reg_address >> 8) & 0xFF; st->tx[1] = (reg_address >> 8) & 0xFF;
st->tx[2] = reg_address & 0xFF; st->tx[2] = reg_address & 0xFF;
st->tx[3] = (value >> 8) & 0xFF; st->tx[3] = (val >> 8) & 0xFF;
st->tx[4] = value & 0xFF; st->tx[4] = val & 0xFF;
ret = spi_sync_transfer(st->spi, &xfer, 1); ret = spi_sync_transfer(st->spi, &xfer, 1);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
...@@ -68,7 +68,7 @@ static int ade7854_spi_write_reg_16(struct device *dev, ...@@ -68,7 +68,7 @@ static int ade7854_spi_write_reg_16(struct device *dev,
static int ade7854_spi_write_reg_24(struct device *dev, static int ade7854_spi_write_reg_24(struct device *dev,
u16 reg_address, u16 reg_address,
u32 value) u32 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -83,9 +83,9 @@ static int ade7854_spi_write_reg_24(struct device *dev, ...@@ -83,9 +83,9 @@ static int ade7854_spi_write_reg_24(struct device *dev,
st->tx[0] = ADE7854_WRITE_REG; st->tx[0] = ADE7854_WRITE_REG;
st->tx[1] = (reg_address >> 8) & 0xFF; st->tx[1] = (reg_address >> 8) & 0xFF;
st->tx[2] = reg_address & 0xFF; st->tx[2] = reg_address & 0xFF;
st->tx[3] = (value >> 16) & 0xFF; st->tx[3] = (val >> 16) & 0xFF;
st->tx[4] = (value >> 8) & 0xFF; st->tx[4] = (val >> 8) & 0xFF;
st->tx[5] = value & 0xFF; st->tx[5] = val & 0xFF;
ret = spi_sync_transfer(st->spi, &xfer, 1); ret = spi_sync_transfer(st->spi, &xfer, 1);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
...@@ -95,7 +95,7 @@ static int ade7854_spi_write_reg_24(struct device *dev, ...@@ -95,7 +95,7 @@ static int ade7854_spi_write_reg_24(struct device *dev,
static int ade7854_spi_write_reg_32(struct device *dev, static int ade7854_spi_write_reg_32(struct device *dev,
u16 reg_address, u16 reg_address,
u32 value) u32 val)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -110,10 +110,10 @@ static int ade7854_spi_write_reg_32(struct device *dev, ...@@ -110,10 +110,10 @@ static int ade7854_spi_write_reg_32(struct device *dev,
st->tx[0] = ADE7854_WRITE_REG; st->tx[0] = ADE7854_WRITE_REG;
st->tx[1] = (reg_address >> 8) & 0xFF; st->tx[1] = (reg_address >> 8) & 0xFF;
st->tx[2] = reg_address & 0xFF; st->tx[2] = reg_address & 0xFF;
st->tx[3] = (value >> 24) & 0xFF; st->tx[3] = (val >> 24) & 0xFF;
st->tx[4] = (value >> 16) & 0xFF; st->tx[4] = (val >> 16) & 0xFF;
st->tx[5] = (value >> 8) & 0xFF; st->tx[5] = (val >> 8) & 0xFF;
st->tx[6] = value & 0xFF; st->tx[6] = val & 0xFF;
ret = spi_sync_transfer(st->spi, &xfer, 1); ret = spi_sync_transfer(st->spi, &xfer, 1);
mutex_unlock(&st->buf_lock); mutex_unlock(&st->buf_lock);
......
...@@ -152,20 +152,20 @@ ...@@ -152,20 +152,20 @@
* @rx: receive buffer * @rx: receive buffer
**/ **/
struct ade7854_state { struct ade7854_state {
struct spi_device *spi; struct spi_device *spi;
struct i2c_client *i2c; struct i2c_client *i2c;
int (*read_reg_8)(struct device *, u16, u8 *); int (*read_reg_8)(struct device *dev, u16 reg_address, u8 *val);
int (*read_reg_16)(struct device *, u16, u16 *); int (*read_reg_16)(struct device *dev, u16 reg_address, u16 *val);
int (*read_reg_24)(struct device *, u16, u32 *); int (*read_reg_24)(struct device *dev, u16 reg_address, u32 *val);
int (*read_reg_32)(struct device *, u16, u32 *); int (*read_reg_32)(struct device *dev, u16 reg_address, u32 *val);
int (*write_reg_8)(struct device *, u16, u8); int (*write_reg_8)(struct device *dev, u16 reg_address, u8 val);
int (*write_reg_16)(struct device *, u16, u16); int (*write_reg_16)(struct device *dev, u16 reg_address, u16 val);
int (*write_reg_24)(struct device *, u16, u32); int (*write_reg_24)(struct device *dev, u16 reg_address, u32 val);
int (*write_reg_32)(struct device *, u16, u32); int (*write_reg_32)(struct device *dev, u16 reg_address, u32 val);
int irq; int irq;
struct mutex buf_lock; struct mutex buf_lock;
u8 tx[ADE7854_MAX_TX] ____cacheline_aligned; u8 tx[ADE7854_MAX_TX] ____cacheline_aligned;
u8 rx[ADE7854_MAX_RX]; u8 rx[ADE7854_MAX_RX];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment