Skip to contentSkip to conversation

staging:iio:meter: Checkpatch cleanup for meter

PATCH Superseded Rodrigo Siqueira 2 participants 6 messages Mar 6, 2018

Subsystems (4)
Staging IIO Analog Devices IIO drivers Staging - industrial io

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Rodrigo Siqueira

author
#0 lore raw

cover staging:iio:meter: Checkpatch cleanup for meter

This patchset fixes errors and checks found by checkpatch.pl in the staging/iio/meter. These series fixes:

* Removes the use of 4 digit octal by replaces IIO_DEV_ATTR_CH_OFF by

	IIO_DEVICE_ATTR;

* Removes unnecessary macro;
* Aligns open parenthesis;

After apply this patch series, meter going to be checkpatch

Rodrigo Siqueira (3):
staging:iio:meter: Replaces IIO_DEV_ATTR_CH_OFF by IIO_DEVICE_ATTR staging:iio:meter: Remove unused macro IIO_DEV_ATTR_CH_OFF staging:iio:meter: Aligns open parenthesis

 drivers/staging/iio/meter/ade7753.c         | 18 +++++++------
 drivers/staging/iio/meter/ade7758_trigger.c |  4 +--
 drivers/staging/iio/meter/ade7759.c         | 18 +++++++------
 drivers/staging/iio/meter/ade7854-spi.c     | 40 ++++++++++++++---------------
 drivers/staging/iio/meter/meter.h           |  3 ---
 5 files changed, 42 insertions(+), 41 deletions(-)
Signature · 6 lines
2.16.2

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
author
#1 lore raw

PATCH 1/3 staging:iio:meter: Replaces IIO_DEV_ATTR_CH_OFF by IIO_DEVICE_ATTR

The macro IIO_DEV_ATTR_CH_OFF is a wrapper for IIO_DEVICE_ATTR, with a tiny change in the name definition. This extra macro does not improve the readability and also creates some checkpatch errors.

This patch fixes the checkpatch.pl errors:

staging/iio/meter/ade7753.c:391: ERROR: Use 4 digit octal (0777) not decimal permissions
staging/iio/meter/ade7753.c:395: ERROR: Use 4 digit octal (0777) not decimal permissions
staging/iio/meter/ade7759.c:331: ERROR: Use 4 digit octal (0777) not decimal permissions
staging/iio/meter/ade7759.c:335: ERROR: Use 4 digit octal (0777) not decimal permissions

Signed-off-by Rodrigo Siqueira <[email protected]>
---
 drivers/staging/iio/meter/ade7753.c | 18 ++++++++++--------
 drivers/staging/iio/meter/ade7759.c | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)
drivers/staging/iio/meter/ade7753.c +10 -8
index c44eb577dc35..275e8dfff836 100644
@@ -388,14 +388,16 @@ static IIO_DEV_ATTR_VPERIOD(0444,
 		ade7753_read_16bit,
 		NULL,
 		ADE7753_PERIOD);
-static IIO_DEV_ATTR_CH_OFF(1, 0644,
-		ade7753_read_8bit,
-		ade7753_write_8bit,
-		ADE7753_CH1OS);
-static IIO_DEV_ATTR_CH_OFF(2, 0644,
-		ade7753_read_8bit,
-		ade7753_write_8bit,
-		ADE7753_CH2OS);
+
+static IIO_DEVICE_ATTR(choff_1, 0644,
+			ade7753_read_8bit,
+			ade7753_write_8bit,
+			ADE7753_CH1OS);
+
+static IIO_DEVICE_ATTR(choff_2, 0644,
+			ade7753_read_8bit,
+			ade7753_write_8bit,
+			ADE7753_CH2OS);
 
 static int ade7753_set_irq(struct device *dev, bool enable)
 {
drivers/staging/iio/meter/ade7759.c +10 -8
index 1decb2b8afab..c078b770fa53 100644
@@ -328,14 +328,16 @@ static IIO_DEV_ATTR_ACTIVE_POWER_GAIN(0644,
 		ade7759_read_16bit,
 		ade7759_write_16bit,
 		ADE7759_APGAIN);
-static IIO_DEV_ATTR_CH_OFF(1, 0644,
-		ade7759_read_8bit,
-		ade7759_write_8bit,
-		ADE7759_CH1OS);
-static IIO_DEV_ATTR_CH_OFF(2, 0644,
-		ade7759_read_8bit,
-		ade7759_write_8bit,
-		ADE7759_CH2OS);
+
+static IIO_DEVICE_ATTR(choff_1, 0644,
+			ade7759_read_8bit,
+			ade7759_write_8bit,
+			ADE7759_CH1OS);
+
+static IIO_DEVICE_ATTR(choff_2, 0644,
+			ade7759_read_8bit,
+			ade7759_write_8bit,
+			ADE7759_CH2OS);
 
 static int ade7759_set_irq(struct device *dev, bool enable)
 {
Signature · 1 line
2.16.2
author
#2 lore raw

PATCH 2/3 staging:iio:meter: Remove unused macro IIO_DEV_ATTR_CH_OFF

In reply to Rodrigo Siqueira

This patch removes the macro IIO_DEV_ATTR_CH_OFF. The macro IIO_DEV_ATTR_CH_OFF is not required, due to the replace of it by the direct use of IIO_DEVICE_ATTR in files staging/iio/meter/ade7759.c and staging/iio/meter/ade7753.c.

Signed-off-by Rodrigo Siqueira <[email protected]>
---
 drivers/staging/iio/meter/meter.h | 3 ---
 1 file changed, 3 deletions(-)
drivers/staging/iio/meter/meter.h +0 -3
index edf26302fa57..5ed59bf30a25 100644
@@ -348,9 +348,6 @@
 #define IIO_DEV_ATTR_VPERIOD(_mode, _show, _store, _addr)		\
 	IIO_DEVICE_ATTR(vperiod, _mode, _show, _store, _addr)
 
-#define IIO_DEV_ATTR_CH_OFF(_num, _mode, _show, _store, _addr)		\
-	IIO_DEVICE_ATTR(choff_##_num, _mode, _show, _store, _addr)
-
 /* active energy register, AENERGY, is more than half full */
 #define IIO_EVENT_ATTR_AENERGY_HALF_FULL(_evlist, _show, _store, _mask) \
 	IIO_EVENT_ATTR_SH(aenergy_half_full, _evlist, _show, _store, _mask)
Signature · 1 line
2.16.2
author
#3 lore raw

PATCH 3/3 staging:iio:meter: Aligns open parenthesis

In reply to Rodrigo Siqueira

This patch fixes the checkpatch.pl checks:

staging/iio/meter/ade7854-spi.c:19: CHECK: Alignment should match open parenthesis
staging/iio/meter/ade7854-spi.c:44: CHECK: Alignment should match open parenthesis
staging/iio/meter/ade7854-spi.c:70: CHECK: Alignment should match open parenthesis
staging/iio/meter/ade7854-spi.c:97: CHECK: Alignment should match open parenthesis
staging/iio/meter/ade7854-spi.c:125: CHECK: Alignment should match open parenthesis

...

Signed-off-by Rodrigo Siqueira <[email protected]>
---
 drivers/staging/iio/meter/ade7758_trigger.c |  4 +--
 drivers/staging/iio/meter/ade7854-spi.c     | 40 ++++++++++++++---------------
 2 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/iio/meter/ade7758_trigger.c +2 -2
index 1f0d1a0cf889..483cb8622571 100644
@@ -30,7 +30,7 @@ static irqreturn_t ade7758_data_rdy_trig_poll(int irq, void *private)
  * ade7758_data_rdy_trigger_set_state() set datardy interrupt state
  **/
 static int ade7758_data_rdy_trigger_set_state(struct iio_trigger *trig,
-						bool state)
+					      bool state)
 {
 	struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
 

@@ -63,7 +63,7 @@ int ade7758_probe_trigger(struct iio_dev *indio_dev)
 	int ret;
 
 	st->trig = iio_trigger_alloc("%s-dev%d",
-					spi_get_device_id(st->us)->name,
+				     spi_get_device_id(st->us)->name,
 					indio_dev->id);
 	if (!st->trig) {
 		ret = -ENOMEM;
drivers/staging/iio/meter/ade7854-spi.c +20 -20
index 72eddfec21f7..4419b8f06197 100644
@@ -16,8 +16,8 @@
 #include "ade7854.h"
 
 static int ade7854_spi_write_reg_8(struct device *dev,
-		u16 reg_address,
-		u8 val)
+				   u16 reg_address,
+				   u8 val)
 {
 	int ret;
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

@@ -41,8 +41,8 @@ static int ade7854_spi_write_reg_8(struct device *dev,
 }
 
 static int ade7854_spi_write_reg_16(struct device *dev,
-		u16 reg_address,
-		u16 val)
+				    u16 reg_address,
+				    u16 val)
 {
 	int ret;
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

@@ -67,8 +67,8 @@ static int ade7854_spi_write_reg_16(struct device *dev,
 }
 
 static int ade7854_spi_write_reg_24(struct device *dev,
-		u16 reg_address,
-		u32 val)
+				    u16 reg_address,
+				    u32 val)
 {
 	int ret;
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

@@ -94,8 +94,8 @@ static int ade7854_spi_write_reg_24(struct device *dev,
 }
 
 static int ade7854_spi_write_reg_32(struct device *dev,
-		u16 reg_address,
-		u32 val)
+				    u16 reg_address,
+				    u32 val)
 {
 	int ret;
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);

@@ -122,8 +122,8 @@ static int ade7854_spi_write_reg_32(struct device *dev,
 }
 
 static int ade7854_spi_read_reg_8(struct device *dev,
-		u16 reg_address,
-		u8 *val)
+				  u16 reg_address,
+				  u8 *val)
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct ade7854_state *st = iio_priv(indio_dev);

@@ -149,7 +149,7 @@ static int ade7854_spi_read_reg_8(struct device *dev,
 	ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
 	if (ret) {
 		dev_err(&st->spi->dev, "problem when reading 8 bit register 0x%02X",
-				reg_address);
+			reg_address);
 		goto error_ret;
 	}
 	*val = st->rx[0];

@@ -160,8 +160,8 @@ static int ade7854_spi_read_reg_8(struct device *dev,
 }
 
 static int ade7854_spi_read_reg_16(struct device *dev,
-		u16 reg_address,
-		u16 *val)
+				   u16 reg_address,
+				   u16 *val)
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct ade7854_state *st = iio_priv(indio_dev);

@@ -186,7 +186,7 @@ static int ade7854_spi_read_reg_16(struct device *dev,
 	ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
 	if (ret) {
 		dev_err(&st->spi->dev, "problem when reading 16 bit register 0x%02X",
-				reg_address);
+			reg_address);
 		goto error_ret;
 	}
 	*val = be16_to_cpup((const __be16 *)st->rx);

@@ -197,8 +197,8 @@ static int ade7854_spi_read_reg_16(struct device *dev,
 }
 
 static int ade7854_spi_read_reg_24(struct device *dev,
-		u16 reg_address,
-		u32 *val)
+				   u16 reg_address,
+				   u32 *val)
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct ade7854_state *st = iio_priv(indio_dev);

@@ -224,7 +224,7 @@ static int ade7854_spi_read_reg_24(struct device *dev,
 	ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
 	if (ret) {
 		dev_err(&st->spi->dev, "problem when reading 24 bit register 0x%02X",
-				reg_address);
+			reg_address);
 		goto error_ret;
 	}
 	*val = (st->rx[0] << 16) | (st->rx[1] << 8) | st->rx[2];

@@ -235,8 +235,8 @@ static int ade7854_spi_read_reg_24(struct device *dev,
 }
 
 static int ade7854_spi_read_reg_32(struct device *dev,
-		u16 reg_address,
-		u32 *val)
+				   u16 reg_address,
+				   u32 *val)
 {
 	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
 	struct ade7854_state *st = iio_priv(indio_dev);

@@ -262,7 +262,7 @@ static int ade7854_spi_read_reg_32(struct device *dev,
 	ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers));
 	if (ret) {
 		dev_err(&st->spi->dev, "problem when reading 32 bit register 0x%02X",
-				reg_address);
+			reg_address);
 		goto error_ret;
 	}
 	*val = be32_to_cpup((const __be32 *)st->rx);
Signature · 1 line
2.16.2
#4 lore raw

Re: [PATCH 3/3] staging:iio:meter: Aligns open parenthesis

drivers/staging/iio/meter/ade7758_trigger.c int ade7758_probe_trigger(struct iio_dev *indio_dev) · line 67

Quoted 7 lines · Rodrigo Siqueira
drivers/staging/iio/meter/ade7758_trigger.c +1 -1
@@ -63,7 +63,7 @@ int ade7758_probe_trigger(struct iio_dev *indio_dev)
 	int ret;
 
 	st->trig = iio_trigger_alloc("%s-dev%d",
-					spi_get_device_id(st->us)->name,
+				     spi_get_device_id(st->us)->name,
 					indio_dev->id);

                                        ^^^^^^^^^^^^^

The "indio_dev->id" needs to be aligned as well.

drivers/staging/iio/meter/ade7758_trigger.c int ade7758_probe_trigger(struct iio_dev *indio_dev) · line 69

Quoted 2 lines
drivers/staging/iio/meter/ade7758_trigger.c +0 -0
 	if (!st->trig) {
 		ret = -ENOMEM;

regards,
dan carpenter

author
#5 lore raw

Re: [PATCH 3/3] staging:iio:meter: Aligns open parenthesis

Hi

Quoted 10 lines · Dan Carpenter

drivers/staging/iio/meter/ade7758_trigger.c int ade7758_probe_trigger(struct iio_dev *indio_dev) · line 67

Quoted 7 lines · Rodrigo Siqueira
drivers/staging/iio/meter/ade7758_trigger.c +1 -1
@@ -63,7 +63,7 @@ int ade7758_probe_trigger(struct iio_dev *indio_dev)
 	int ret;
 
 	st->trig = iio_trigger_alloc("%s-dev%d",
-					spi_get_device_id(st->us)->name,
+				     spi_get_device_id(st->us)->name,
 					indio_dev->id);

                                        ^^^^^^^^^^^^^

The "indio_dev->id" needs to be aligned as well.

I will fix it and send a v2.

Thanks for the review!

Quoted 6 lines

drivers/staging/iio/meter/ade7758_trigger.c int ade7758_probe_trigger(struct iio_dev *indio_dev) · line 69

Quoted 2 lines
drivers/staging/iio/meter/ade7758_trigger.c +0 -0
 	if (!st->trig) {
 		ret = -ENOMEM;

regards,
dan carpenter

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel