| Message ID | 20191209174205.190025-1-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 43d23b94e5e863909b397c8b962f268ea2656ee4 |
| Headers | show |
| Series | Fix a compiler warning triggered by the SCSI logging code | expand |
Bart, > This patch fixes the following compiler warning: > > In file included from drivers/scsi/scsi_error.c:46: > drivers/scsi/scsi_error.c: In function 'scsi_eh_target_reset': > drivers/scsi/scsi_logging.h:65:81: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] > 65 | LOGGING(SCSI_LOG_ERROR_SHIFT, SCSI_LOG_ERROR_BITS, LEVEL,CMD); > | ^ Applied to 5.6/scsi-queue, thanks!
diff --git a/drivers/scsi/scsi_logging.h b/drivers/scsi/scsi_logging.h index 836185de28c4..3df877886119 100644 --- a/drivers/scsi/scsi_logging.h +++ b/drivers/scsi/scsi_logging.h @@ -53,7 +53,7 @@ do { \ } while (0) #else #define SCSI_LOG_LEVEL(SHIFT, BITS) 0 -#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) +#define SCSI_CHECK_LOGGING(SHIFT, BITS, LEVEL, CMD) do { } while (0) #endif /* CONFIG_SCSI_LOGGING */ /*
This patch fixes the following compiler warning: In file included from drivers/scsi/scsi_error.c:46: drivers/scsi/scsi_error.c: In function 'scsi_eh_target_reset': drivers/scsi/scsi_logging.h:65:81: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] 65 | LOGGING(SCSI_LOG_ERROR_SHIFT, SCSI_LOG_ERROR_BITS, LEVEL,CMD); | ^ drivers/scsi/scsi_error.c:1562:4: note: in expansion of macro 'SCSI_LOG_ERROR_RECOVERY' 1562 | SCSI_LOG_ERROR_RECOVERY(3, | ^~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/scsi_logging.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)