diff options
author | Georgiana Rodica Chelu <georgiana.chelu93@gmail.com> | 2016-09-19 12:35:09 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-20 07:43:32 -0400 |
commit | 748df3b1a429151ef05010792be254feeb83e201 (patch) | |
tree | 60e805738c3ac03abaec1a4e745a1cc88ab51839 /drivers/staging | |
parent | 89237e06e2a57899424c8c51bada9b4046161e07 (diff) |
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: Georgiana Rodica Chelu <georgiana.chelu93@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/iio/meter/ade7754.c | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/drivers/staging/iio/meter/ade7754.c b/drivers/staging/iio/meter/ade7754.c index c46bef641613..17309591ca57 100644 --- a/drivers/staging/iio/meter/ade7754.c +++ b/drivers/staging/iio/meter/ade7754.c | |||
@@ -23,9 +23,7 @@ | |||
23 | #include "meter.h" | 23 | #include "meter.h" |
24 | #include "ade7754.h" | 24 | #include "ade7754.h" |
25 | 25 | ||
26 | static int ade7754_spi_write_reg_8(struct device *dev, | 26 | static int ade7754_spi_write_reg_8(struct device *dev, u8 reg_address, u8 val) |
27 | u8 reg_address, | ||
28 | u8 val) | ||
29 | { | 27 | { |
30 | int ret; | 28 | int ret; |
31 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 29 | 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 | } | 40 | } |
43 | 41 | ||
44 | static int ade7754_spi_write_reg_16(struct device *dev, | 42 | static int ade7754_spi_write_reg_16(struct device *dev, |
45 | u8 reg_address, | 43 | u8 reg_address, u16 value) |
46 | u16 value) | ||
47 | { | 44 | { |
48 | int ret; | 45 | int ret; |
49 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 46 | 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 | return ret; | 56 | return ret; |
60 | } | 57 | } |
61 | 58 | ||
62 | static int ade7754_spi_read_reg_8(struct device *dev, | 59 | static int ade7754_spi_read_reg_8(struct device *dev, u8 reg_address, u8 *val) |
63 | u8 reg_address, | ||
64 | u8 *val) | ||
65 | { | 60 | { |
66 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 61 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); |
67 | struct ade7754_state *st = iio_priv(indio_dev); | 62 | struct ade7754_state *st = iio_priv(indio_dev); |
@@ -70,7 +65,7 @@ static int ade7754_spi_read_reg_8(struct device *dev, | |||
70 | ret = spi_w8r8(st->us, ADE7754_READ_REG(reg_address)); | 65 | ret = spi_w8r8(st->us, ADE7754_READ_REG(reg_address)); |
71 | if (ret < 0) { | 66 | if (ret < 0) { |
72 | dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X", | 67 | dev_err(&st->us->dev, "problem when reading 8 bit register 0x%02X", |
73 | reg_address); | 68 | reg_address); |
74 | return ret; | 69 | return ret; |
75 | } | 70 | } |
76 | *val = ret; | 71 | *val = ret; |
@@ -79,8 +74,7 @@ static int ade7754_spi_read_reg_8(struct device *dev, | |||
79 | } | 74 | } |
80 | 75 | ||
81 | static int ade7754_spi_read_reg_16(struct device *dev, | 76 | static int ade7754_spi_read_reg_16(struct device *dev, |
82 | u8 reg_address, | 77 | u8 reg_address, u16 *val) |
83 | u16 *val) | ||
84 | { | 78 | { |
85 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 79 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); |
86 | struct ade7754_state *st = iio_priv(indio_dev); | 80 | struct ade7754_state *st = iio_priv(indio_dev); |
@@ -99,8 +93,7 @@ static int ade7754_spi_read_reg_16(struct device *dev, | |||
99 | } | 93 | } |
100 | 94 | ||
101 | static int ade7754_spi_read_reg_24(struct device *dev, | 95 | static int ade7754_spi_read_reg_24(struct device *dev, |
102 | u8 reg_address, | 96 | u8 reg_address, u32 *val) |
103 | u32 *val) | ||
104 | { | 97 | { |
105 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 98 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); |
106 | struct ade7754_state *st = iio_priv(indio_dev); | 99 | struct ade7754_state *st = iio_priv(indio_dev); |
@@ -123,7 +116,7 @@ static int ade7754_spi_read_reg_24(struct device *dev, | |||
123 | ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers)); | 116 | ret = spi_sync_transfer(st->us, xfers, ARRAY_SIZE(xfers)); |
124 | if (ret) { | 117 | if (ret) { |
125 | dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X", | 118 | dev_err(&st->us->dev, "problem when reading 24 bit register 0x%02X", |
126 | reg_address); | 119 | reg_address); |
127 | goto error_ret; | 120 | goto error_ret; |
128 | } | 121 | } |
129 | *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3]; | 122 | *val = (st->rx[1] << 16) | (st->rx[2] << 8) | st->rx[3]; |
@@ -134,8 +127,8 @@ error_ret: | |||
134 | } | 127 | } |
135 | 128 | ||
136 | static ssize_t ade7754_read_8bit(struct device *dev, | 129 | static ssize_t ade7754_read_8bit(struct device *dev, |
137 | struct device_attribute *attr, | 130 | struct device_attribute *attr, |
138 | char *buf) | 131 | char *buf) |
139 | { | 132 | { |
140 | int ret; | 133 | int ret; |
141 | u8 val = 0; | 134 | u8 val = 0; |
@@ -149,8 +142,8 @@ static ssize_t ade7754_read_8bit(struct device *dev, | |||
149 | } | 142 | } |
150 | 143 | ||
151 | static ssize_t ade7754_read_16bit(struct device *dev, | 144 | static ssize_t ade7754_read_16bit(struct device *dev, |
152 | struct device_attribute *attr, | 145 | struct device_attribute *attr, |
153 | char *buf) | 146 | char *buf) |
154 | { | 147 | { |
155 | int ret; | 148 | int ret; |
156 | u16 val = 0; | 149 | u16 val = 0; |
@@ -164,8 +157,8 @@ static ssize_t ade7754_read_16bit(struct device *dev, | |||
164 | } | 157 | } |
165 | 158 | ||
166 | static ssize_t ade7754_read_24bit(struct device *dev, | 159 | static ssize_t ade7754_read_24bit(struct device *dev, |
167 | struct device_attribute *attr, | 160 | struct device_attribute *attr, |
168 | char *buf) | 161 | char *buf) |
169 | { | 162 | { |
170 | int ret; | 163 | int ret; |
171 | u32 val = 0; | 164 | u32 val = 0; |
@@ -179,9 +172,9 @@ static ssize_t ade7754_read_24bit(struct device *dev, | |||
179 | } | 172 | } |
180 | 173 | ||
181 | static ssize_t ade7754_write_8bit(struct device *dev, | 174 | static ssize_t ade7754_write_8bit(struct device *dev, |
182 | struct device_attribute *attr, | 175 | struct device_attribute *attr, |
183 | const char *buf, | 176 | const char *buf, |
184 | size_t len) | 177 | size_t len) |
185 | { | 178 | { |
186 | struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); | 179 | struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); |
187 | int ret; | 180 | int ret; |
@@ -197,9 +190,9 @@ error_ret: | |||
197 | } | 190 | } |
198 | 191 | ||
199 | static ssize_t ade7754_write_16bit(struct device *dev, | 192 | static ssize_t ade7754_write_16bit(struct device *dev, |
200 | struct device_attribute *attr, | 193 | struct device_attribute *attr, |
201 | const char *buf, | 194 | const char *buf, |
202 | size_t len) | 195 | size_t len) |
203 | { | 196 | { |
204 | struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); | 197 | struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); |
205 | int ret; | 198 | int ret; |
@@ -403,16 +396,14 @@ err_ret: | |||
403 | } | 396 | } |
404 | 397 | ||
405 | static ssize_t ade7754_read_frequency(struct device *dev, | 398 | static ssize_t ade7754_read_frequency(struct device *dev, |
406 | struct device_attribute *attr, | 399 | struct device_attribute *attr, |
407 | char *buf) | 400 | char *buf) |
408 | { | 401 | { |
409 | int ret; | 402 | int ret; |
410 | u8 t; | 403 | u8 t; |
411 | int sps; | 404 | int sps; |
412 | 405 | ||
413 | ret = ade7754_spi_read_reg_8(dev, | 406 | ret = ade7754_spi_read_reg_8(dev, ADE7754_WAVMODE, &t); |
414 | ADE7754_WAVMODE, | ||
415 | &t); | ||
416 | if (ret) | 407 | if (ret) |
417 | return ret; | 408 | return ret; |
418 | 409 | ||
@@ -423,9 +414,9 @@ static ssize_t ade7754_read_frequency(struct device *dev, | |||
423 | } | 414 | } |
424 | 415 | ||
425 | static ssize_t ade7754_write_frequency(struct device *dev, | 416 | static ssize_t ade7754_write_frequency(struct device *dev, |
426 | struct device_attribute *attr, | 417 | struct device_attribute *attr, |
427 | const char *buf, | 418 | const char *buf, |
428 | size_t len) | 419 | size_t len) |
429 | { | 420 | { |
430 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); | 421 | struct iio_dev *indio_dev = dev_to_iio_dev(dev); |
431 | struct ade7754_state *st = iio_priv(indio_dev); | 422 | struct ade7754_state *st = iio_priv(indio_dev); |