Commit 748df3b1 authored by Georgiana Rodica Chelu's avatar Georgiana Rodica Chelu Committed by Greg Kroah-Hartman

staging: iio: meter: ade7754: Match alignment with open parenthesis

Reorganize the parameters to improve the readability of the code in
two manners:
- parameters of distinctive variable types on different lines
- parameters of similar variable types on the same line

Also, take advantage of the horizontal space available and place
all the parameters on a single line.

Issues found by checkpatch.pl script.
Signed-off-by: default avatarGeorgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 89237e06
...@@ -23,9 +23,7 @@ ...@@ -23,9 +23,7 @@
#include "meter.h" #include "meter.h"
#include "ade7754.h" #include "ade7754.h"
static int ade7754_spi_write_reg_8(struct device *dev, static int ade7754_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val)
u8 reg_address,
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);
...@@ -42,8 +40,7 @@ static int ade7754_spi_write_reg_8(struct device *dev, ...@@ -42,8 +40,7 @@ static int ade7754_spi_write_reg_8(struct device *dev,
} }
static int ade7754_spi_write_reg_16(struct device *dev, static int ade7754_spi_write_reg_16(struct device *dev,
u8 reg_address, u8 reg_address, u16 value)
u16 value)
{ {
int ret; int ret;
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
...@@ -59,9 +56,7 @@ static int ade7754_spi_write_reg_16(struct device *dev, ...@@ -59,9 +56,7 @@ static int ade7754_spi_write_reg_16(struct device *dev,
return ret; return ret;
} }
static int ade7754_spi_read_reg_8(struct device *dev, static int ade7754_spi_read_reg_8(struct device *dev, u8 reg_address, u8 *val)
u8 reg_address,
u8 *val)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ade7754_state *st = iio_priv(indio_dev); struct ade7754_state *st = iio_priv(indio_dev);
...@@ -70,7 +65,7 @@ static int ade7754_spi_read_reg_8(struct device *dev, ...@@ -70,7 +65,7 @@ static int ade7754_spi_read_reg_8(struct device *dev,
ret = spi_w8r8(st->us, ADE7754_READ_REG(reg_address)); ret = spi_w8r8(st->us, ADE7754_READ_REG(reg_address));
if (ret < 0) { if (ret < 0) {
dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X", dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X",
reg_address); reg_address);
return ret; return ret;
} }
*val = ret; *val = ret;
...@@ -79,8 +74,7 @@ static int ade7754_spi_read_reg_8(struct device *dev, ...@@ -79,8 +74,7 @@ static int ade7754_spi_read_reg_8(struct device *dev,
} }
static int ade7754_spi_read_reg_16(struct device *dev, static int ade7754_spi_read_reg_16(struct device *dev,
u8 reg_address, u8 reg_address, u16 *val)
u16 *val)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ade7754_state *st = iio_priv(indio_dev); struct ade7754_state *st = iio_priv(indio_dev);
...@@ -99,8 +93,7 @@ static int ade7754_spi_read_reg_16(struct device *dev, ...@@ -99,8 +93,7 @@ static int ade7754_spi_read_reg_16(struct device *dev,
} }
static int ade7754_spi_read_reg_24(struct device *dev, static int ade7754_spi_read_reg_24(struct device *dev,
u8 reg_address, u8 reg_address, u32 *val)
u32 *val)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ade7754_state *st = iio_priv(indio_dev); struct ade7754_state *st = iio_priv(indio_dev);
...@@ -123,7 +116,7 @@ static int ade7754_spi_read_reg_24(struct device *dev, ...@@ -123,7 +116,7 @@ static int ade7754_spi_read_reg_24(struct device *dev,
ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers)); ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers));
if (ret) { if (ret) {
dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X", dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X",
reg_address); reg_address);
goto error_ret; goto error_ret;
} }
*val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3]; *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3];
...@@ -134,8 +127,8 @@ static int ade7754_spi_read_reg_24(struct device *dev, ...@@ -134,8 +127,8 @@ static int ade7754_spi_read_reg_24(struct device *dev,
} }
static ssize_t ade7754_read_8bit(struct device *dev, static ssize_t ade7754_read_8bit(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
int ret; int ret;
u8 val = 0; u8 val = 0;
...@@ -149,8 +142,8 @@ static ssize_t ade7754_read_8bit(struct device *dev, ...@@ -149,8 +142,8 @@ static ssize_t ade7754_read_8bit(struct device *dev,
} }
static ssize_t ade7754_read_16bit(struct device *dev, static ssize_t ade7754_read_16bit(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
int ret; int ret;
u16 val = 0; u16 val = 0;
...@@ -164,8 +157,8 @@ static ssize_t ade7754_read_16bit(struct device *dev, ...@@ -164,8 +157,8 @@ static ssize_t ade7754_read_16bit(struct device *dev,
} }
static ssize_t ade7754_read_24bit(struct device *dev, static ssize_t ade7754_read_24bit(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
int ret; int ret;
u32 val = 0; u32 val = 0;
...@@ -179,9 +172,9 @@ static ssize_t ade7754_read_24bit(struct device *dev, ...@@ -179,9 +172,9 @@ static ssize_t ade7754_read_24bit(struct device *dev,
} }
static ssize_t ade7754_write_8bit(struct device *dev, static ssize_t ade7754_write_8bit(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len) size_t len)
{ {
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
int ret; int ret;
...@@ -197,9 +190,9 @@ static ssize_t ade7754_write_8bit(struct device *dev, ...@@ -197,9 +190,9 @@ static ssize_t ade7754_write_8bit(struct device *dev,
} }
static ssize_t ade7754_write_16bit(struct device *dev, static ssize_t ade7754_write_16bit(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len) size_t len)
{ {
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
int ret; int ret;
...@@ -403,16 +396,14 @@ static int ade7754_initial_setup(struct iio_dev *indio_dev) ...@@ -403,16 +396,14 @@ static int ade7754_initial_setup(struct iio_dev *indio_dev)
} }
static ssize_t ade7754_read_frequency(struct device *dev, static ssize_t ade7754_read_frequency(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
int ret; int ret;
u8 t; u8 t;
int sps; int sps;
ret = ade7754_spi_read_reg_8(dev, ret = ade7754_spi_read_reg_8(dev, ADE7754_WAVMODE, &t);
ADE7754_WAVMODE,
&t);
if (ret) if (ret)
return ret; return ret;
...@@ -423,9 +414,9 @@ static ssize_t ade7754_read_frequency(struct device *dev, ...@@ -423,9 +414,9 @@ static ssize_t ade7754_read_frequency(struct device *dev,
} }
static ssize_t ade7754_write_frequency(struct device *dev, static ssize_t ade7754_write_frequency(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, const char *buf,
size_t len) size_t len)
{ {
struct iio_dev *indio_dev = dev_to_iio_dev(dev); struct iio_dev *indio_dev = dev_to_iio_dev(dev);
struct ade7754_state *st = iio_priv(indio_dev); struct ade7754_state *st = iio_priv(indio_dev);
......
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