[PATCH] Staging: dgnc: Clean up Macros

[PATCH] Staging: dgnc: Clean up Macros

[Siddhi Dave]

Fix checkpatch warning: Macros with flow control statements should be avoided

Because Macros with flow control statements (goto and return) are
not very nice to read as any flow movement is unexpected.

Signed-off-by: Siddhi Dave <d.sandy5990@gmail.com>
---
 drivers/staging/dgnc/dgnc_sysfs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c
index 290bf6e..0767740 100644
--- a/drivers/staging/dgnc/dgnc_sysfs.c
+++ b/drivers/staging/dgnc/dgnc_sysfs.c
@@ -90,16 +90,16 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
 	driver_remove_file(driverfs, &driver_attr_pollrate);
 }
 
-#define DGNC_VERIFY_BOARD(p, bd)				\
-	do {							\
-		if (!p)						\
-			return 0;				\
-								\
-		bd = dev_get_drvdata(p);			\
-		if (!bd || bd->magic != DGNC_BOARD_MAGIC)	\
-			return 0;				\
-		if (bd->state != BOARD_READY)			\
-			return 0;				\
+#define DGNC_VERIFY_BOARD(p, bd)
+do {
+	if (!p)
+		return 0;
+
+		bd = dev_get_drvdata(p);
+		if (!bd || bd->magic != DGNC_BOARD_MAGIC)
+			return 0;
+		if (bd->state != BOARD_READY)
+			return 0;
 	} while (0)
 
 static ssize_t vpd_show(struct device *p, struct device_attribute *attr,
-- 
2.7.4

Re: [Outreachy kernel] [PATCH] Staging: dgnc: Clean up Macros

[Julia Lawall]

On Sun, 16 Oct 2016, Siddhi Dave wrote:

> Fix checkpatch warning: Macros with flow control statements should be avoided
>
> Because Macros with flow control statements (goto and return) are
> not very nice to read as any flow movement is unexpected.
>
> Signed-off-by: Siddhi Dave <d.sandy5990@gmail.com>
> ---
>  drivers/staging/dgnc/dgnc_sysfs.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c
> index 290bf6e..0767740 100644
> --- a/drivers/staging/dgnc/dgnc_sysfs.c
> +++ b/drivers/staging/dgnc/dgnc_sysfs.c
> @@ -90,16 +90,16 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
>  	driver_remove_file(driverfs, &driver_attr_pollrate);
>  }
>
> -#define DGNC_VERIFY_BOARD(p, bd)				\
> -	do {							\
> -		if (!p)						\
> -			return 0;				\
> -								\
> -		bd = dev_get_drvdata(p);			\
> -		if (!bd || bd->magic != DGNC_BOARD_MAGIC)	\
> -			return 0;				\
> -		if (bd->state != BOARD_READY)			\
> -			return 0;				\
> +#define DGNC_VERIFY_BOARD(p, bd)
> +do {
> +	if (!p)
> +		return 0;
> +
> +		bd = dev_get_drvdata(p);
> +		if (!bd || bd->magic != DGNC_BOARD_MAGIC)
> +			return 0;
> +		if (bd->state != BOARD_READY)
> +			return 0;
>  	} while (0)

This does not look correct.  You are still sort of defining a macro,
except that you have dropped all of the \s.  A macro has to be defined on
a single line, or a line continued with \, so this would cause major
syntax errors.  I think that someone else worked on similar code and found
that some of the tests were also not needed in the context in which this
code is used.

julia

>
>  static ssize_t vpd_show(struct device *p, struct device_attribute *attr,
> --
> 2.7.4
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20161016124231.GA18162%40siddhi-home-laptop.
> For more options, visit https://groups.google.com/d/optout.
>

Re: [PATCH] Staging: dgnc: Clean up Macros

[Greg KH]

On Sun, Oct 16, 2016 at 06:12:32PM +0530, Siddhi Dave wrote:
> Fix checkpatch warning: Macros with flow control statements should be avoided
> 
> Because Macros with flow control statements (goto and return) are
> not very nice to read as any flow movement is unexpected.
> 
> Signed-off-by: Siddhi Dave <d.sandy5990@gmail.com>
> ---
>  drivers/staging/dgnc/dgnc_sysfs.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c
> index 290bf6e..0767740 100644
> --- a/drivers/staging/dgnc/dgnc_sysfs.c
> +++ b/drivers/staging/dgnc/dgnc_sysfs.c
> @@ -90,16 +90,16 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
>  	driver_remove_file(driverfs, &driver_attr_pollrate);
>  }
>  
> -#define DGNC_VERIFY_BOARD(p, bd)				\
> -	do {							\
> -		if (!p)						\
> -			return 0;				\
> -								\
> -		bd = dev_get_drvdata(p);			\
> -		if (!bd || bd->magic != DGNC_BOARD_MAGIC)	\
> -			return 0;				\
> -		if (bd->state != BOARD_READY)			\
> -			return 0;				\
> +#define DGNC_VERIFY_BOARD(p, bd)
> +do {
> +	if (!p)
> +		return 0;
> +
> +		bd = dev_get_drvdata(p);
> +		if (!bd || bd->magic != DGNC_BOARD_MAGIC)
> +			return 0;
> +		if (bd->state != BOARD_READY)
> +			return 0;
>  	} while (0)
>  
>  static ssize_t vpd_show(struct device *p, struct device_attribute *attr,

You didn't test-build this code, why not?

Also, please see the archives for why this type of change is not going
to be correct and I can't take it.

And finally, you sent 3 copies of this, why?

thanks,

greg k-h

[PATCH] Staging: dgnc: Clean up Macros

[Siddhi Dave]

Fix checkpatch warning: Macros with flow control statements should be avoided

Because Macros with flow control statements (goto and return) are
not very nice to read as any flow movement is unexpected.

Signed-off-by: Siddhi Dave <d.sandy5990@gmail.com>
---
 drivers/staging/dgnc/dgnc_sysfs.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/dgnc/dgnc_sysfs.c b/drivers/staging/dgnc/dgnc_sysfs.c
index 290bf6e..0767740 100644
--- a/drivers/staging/dgnc/dgnc_sysfs.c
+++ b/drivers/staging/dgnc/dgnc_sysfs.c
@@ -90,16 +90,16 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
 	driver_remove_file(driverfs, &driver_attr_pollrate);
 }
 
-#define DGNC_VERIFY_BOARD(p, bd)				\
-	do {							\
-		if (!p)						\
-			return 0;				\
-								\
-		bd = dev_get_drvdata(p);			\
-		if (!bd || bd->magic != DGNC_BOARD_MAGIC)	\
-			return 0;				\
-		if (bd->state != BOARD_READY)			\
-			return 0;				\
+#define DGNC_VERIFY_BOARD(p, bd)
+do {
+	if (!p)
+		return 0;
+
+		bd = dev_get_drvdata(p);
+		if (!bd || bd->magic != DGNC_BOARD_MAGIC)
+			return 0;
+		if (bd->state != BOARD_READY)
+			return 0;
 	} while (0)
 
 static ssize_t vpd_show(struct device *p, struct device_attribute *attr,
-- 
2.7.4