scsi: aacraid: Fix logical bug when !DBG
authorLee Jones <lee.jones@linaro.org>
Mon, 13 Jul 2020 07:59:40 +0000 (08:59 +0100)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 15 Jul 2020 21:25:04 +0000 (17:25 -0400)
When DBG is not enabled FIB_COUNTER_INCREMENT() results in an empty
statement, leaving the contents of if() and else() empty.

Fixes the following W=1 kernel build warning(s):

 drivers/scsi/aacraid/dpcsup.c: In function ‘aac_response_normal’:
 drivers/scsi/aacraid/dpcsup.c:105:50: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
 105 | FIB_COUNTER_INCREMENT(aac_config.AsyncRecved);
 | ^
 drivers/scsi/aacraid/dpcsup.c: In function ‘aac_intr_normal’:
 drivers/scsi/aacraid/dpcsup.c:411:30: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body]
 411 | aac_config.AsyncRecved);
 | ^

Link: https://lore.kernel.org/r/20200713080001.128044-4-lee.jones@linaro.org
Cc: Adaptec OEM Raid Solutions <aacraid@microsemi.com>
Cc: "PMC-Sierra, Inc" <aacraid@pmc-sierra.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/aacraid/dpcsup.c

index a557aa629827ef32badf2e2b8303b8979819630b..25ebb94368f2c281ae7c63eae571039d857a9711 100644 (file)
@@ -99,10 +99,11 @@ unsigned int aac_response_normal(struct aac_queue * q)
                }
                if (hwfib->header.XferState & cpu_to_le32(NoResponseExpected | Async)) 
                {
-                       if (hwfib->header.XferState & cpu_to_le32(NoResponseExpected))
+                       if (hwfib->header.XferState & cpu_to_le32(NoResponseExpected)) {
                                FIB_COUNTER_INCREMENT(aac_config.NoResponseRecved);
-                       else 
+                       } else {
                                FIB_COUNTER_INCREMENT(aac_config.AsyncRecved);
+                       }
                        /*
                         *      NOTE:  we cannot touch the fib after this
                         *          call, because it may have been deallocated.
@@ -403,12 +404,13 @@ unsigned int aac_intr_normal(struct aac_dev *dev, u32 index, int isAif,
                        if (hwfib->header.XferState &
                                cpu_to_le32(NoResponseExpected | Async)) {
                                if (hwfib->header.XferState & cpu_to_le32(
-                                       NoResponseExpected))
+                                       NoResponseExpected)) {
                                        FIB_COUNTER_INCREMENT(
                                                aac_config.NoResponseRecved);
-                               else
+                               } else {
                                        FIB_COUNTER_INCREMENT(
                                                aac_config.AsyncRecved);
+                               }
                                start_callback = 1;
                        } else {
                                unsigned long flagv;