diff mbox series

[v2] fusion: fix if-statement empty body warning

Message ID ff9df31b-c4c1-c942-1cbf-18039e084c8e@infradead.org (mailing list archive)
State Mainlined
Commit 5848fe960b080b1e731b467b6e026de841c65234
Headers show
Series [v2] fusion: fix if-statement empty body warning | expand

Commit Message

Randy Dunlap March 8, 2020, 5:01 a.m. UTC 
From: Randy Dunlap <rdunlap@infradead.org>

When driver debugging is not enabled, change the debug print macros
to use the no_printk() macro.

This fixes a gcc warning when -Wextra is set:
../drivers/message/fusion/mptlan.c:266:39: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]

I have verified that there is very little object code change (with
gcc 7.5.0). There are a few changes like:
  cmp %a,%b
  jl $1
to
  cmp %b,%a
  jg $1

Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Chaitra P B <chaitra.basappa@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Cc: MPT-FusionLinux.pdl@broadcom.com
Cc: linux-scsi@vger.kernel.org
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Bart van Assche <bvanassche@acm.org>
---
v2: use no_printk() macro instead of an empty do-while loop (Bart)

 drivers/message/fusion/mptlan.h |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Hannes Reinecke March 9, 2020, 7:14 a.m. UTC | #1 
On 3/8/20 6:01 AM, Randy Dunlap wrote:
> From: Randy Dunlap <rdunlap@infradead.org>
> 
> When driver debugging is not enabled, change the debug print macros
> to use the no_printk() macro.
> 
> This fixes a gcc warning when -Wextra is set:
> ../drivers/message/fusion/mptlan.c:266:39: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
> 
> I have verified that there is very little object code change (with
> gcc 7.5.0). There are a few changes like:
>   cmp %a,%b
>   jl $1
> to
>   cmp %b,%a
>   jg $1
> 
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Sathya Prakash <sathya.prakash@broadcom.com>
> Cc: Chaitra P B <chaitra.basappa@broadcom.com>
> Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
> Cc: MPT-FusionLinux.pdl@broadcom.com
> Cc: linux-scsi@vger.kernel.org
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
> Cc: Bart Van Assche <bvanassche@acm.org>
> Reviewed-by: Bart van Assche <bvanassche@acm.org>
> ---
> v2: use no_printk() macro instead of an empty do-while loop (Bart)
> 
>  drivers/message/fusion/mptlan.h |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> --- linux-next-20200306.orig/drivers/message/fusion/mptlan.h
> +++ linux-next-20200306/drivers/message/fusion/mptlan.h
> @@ -64,6 +64,7 @@
>  #include <linux/if_arp.h>
>  #include <linux/init.h>
>  #include <linux/kernel.h>
> +#include <linux/printk.h>
>  #include <linux/slab.h>
>  #include <linux/spinlock.h>
>  #include <linux/workqueue.h>
> @@ -111,13 +112,13 @@ MODULE_DESCRIPTION(LANAME);
>  #ifdef MPT_LAN_IO_DEBUG
>  #define dioprintk(x)  printk x
>  #else
> -#define dioprintk(x)
> +#define dioprintk(x)  no_printk x
>  #endif
>  
>  #ifdef MPT_LAN_DEBUG
>  #define dlprintk(x)  printk x
>  #else
> -#define dlprintk(x)
> +#define dlprintk(x)  no_printk x
>  #endif
>  
>  #define NETDEV_TO_LANPRIV_PTR(d)	((struct mpt_lan_priv *)netdev_priv(d))
> 
> 
Reviewed-by: Hannes Reinecke <hare@suse.de>

Cheers,

Hannes
Martin K. Petersen March 10, 2020, 10:48 p.m. UTC | #2 
Randy,

> When driver debugging is not enabled, change the debug print macros to
> use the no_printk() macro.

Applied to 5.7/scsi-queue, thanks!
diff mbox series

Patch

--- linux-next-20200306.orig/drivers/message/fusion/mptlan.h
+++ linux-next-20200306/drivers/message/fusion/mptlan.h
@@ -64,6 +64,7 @@ 
 #include <linux/if_arp.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
+#include <linux/printk.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>
@@ -111,13 +112,13 @@  MODULE_DESCRIPTION(LANAME);
 #ifdef MPT_LAN_IO_DEBUG
 #define dioprintk(x)  printk x
 #else
-#define dioprintk(x)
+#define dioprintk(x)  no_printk x
 #endif
 
 #ifdef MPT_LAN_DEBUG
 #define dlprintk(x)  printk x
 #else
-#define dlprintk(x)
+#define dlprintk(x)  no_printk x
 #endif
 
 #define NETDEV_TO_LANPRIV_PTR(d)	((struct mpt_lan_priv *)netdev_priv(d))