Skip to contentSkip to conversation

mvsas: avoid -Wempty-body warning

PATCH Applied Arnd Bergmann 2 participants 2 messages Mar 22, 2021 – Apr 6, 2021 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mvsas: avoid -Wempty-body warning

From: Arnd Bergmann <[email protected]>

Building with 'make W=1' shows a few harmless -Wempty-body warning for the mvsas driver:

drivers/scsi/mvsas/mv_94xx.c: In function 'mvs_94xx_phy_reset':
drivers/scsi/mvsas/mv_94xx.c:278:63: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
278 | mv_dprintk("phy hard reset failed.\n");
| ^
drivers/scsi/mvsas/mv_sas.c: In function 'mvs_task_prep':
drivers/scsi/mvsas/mv_sas.c:723:57: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
723 | SAS_ADDR(dev->sas_addr));
| ^

Change the empty dprintk() macros to no_printk(), which avoids this warning and adds format string checking.

---
 drivers/scsi/mvsas/mv_sas.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mvsas/mv_sas.h +1 -1
index 327fdd5ee962..8ff976c9967e 100644
@@ -40,7 +40,7 @@
 #define mv_dprintk(format, arg...)	\
 	printk(KERN_DEBUG"%s %d:" format, __FILE__, __LINE__, ## arg)
 #else
-#define mv_dprintk(format, arg...)
+#define mv_dprintk(format, arg...) no_printk(format, ## arg)
 #endif
 #define MV_MAX_U32			0xffffffff
 
Signature · 1 line
2.29.2
#1 lore raw
Quoted 12 lines · Arnd Bergmann

Building with 'make W=1' shows a few harmless -Wempty-body warning for the mvsas driver:

drivers/scsi/mvsas/mv_94xx.c: In function 'mvs_94xx_phy_reset':
drivers/scsi/mvsas/mv_94xx.c:278:63: error: suggest braces around empty body in an 'if' statement [-Werror=empty-body]
278 | mv_dprintk("phy hard reset failed.\n");
| ^
drivers/scsi/mvsas/mv_sas.c: In function 'mvs_task_prep':
drivers/scsi/mvsas/mv_sas.c:723:57: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]
723 | SAS_ADDR(dev->sas_addr));
| ^

Quoted 1 line

[...]

Applied to 5.13/scsi-queue, thanks!

[1/1] mvsas: avoid -Wempty-body warning

      https://git.kernel.org/mkp/scsi/c/ae3645d29d4e
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering