scsi: FlashPoint: Remove unnecessary parentheses
Subsystems (2)
PATCH 1/1 scsi: FlashPoint: Remove unnecessary parentheses
Clang warns when multiple pairs of parentheses are used for a single conditional statement.
In file included from drivers/scsi/BusLogic.c:57:drivers/scsi/FlashPoint.c:2947:34: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
if ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) {
~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~drivers/scsi/FlashPoint.c:2947:34: note: remove extraneous parentheses around the comparison to silence this warning
if ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) {
~ ^ ~drivers/scsi/FlashPoint.c:2947:34: note: use '=' to turn this equality comparison into an assignment
if ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) {
^~
=
drivers/scsi/FlashPoint.c:2956:39: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]
else if ((currSCCB->Sccb_scsistat ==
~~~~~~~~~~~~~~~~~~~~~~~~^~
drivers/scsi/FlashPoint.c:2956:39: note: remove extraneous parentheses around the comparison to silence this warning
else if ((currSCCB->Sccb_scsistat ==
~ ^
drivers/scsi/FlashPoint.c:2956:39: note: use '=' to turn this equality comparison into an assignment
else if ((currSCCB->Sccb_scsistat ==
^~
=2 warnings generated.
--- drivers/scsi/FlashPoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/FlashPoint.c +3 -3
@@ -2944,7 +2944,7 @@ static void FPT_sdecm(unsigned char message, u32 port, unsigned char p_card) }if (currSCCB->Lun ==0x00 ) { -if ((currSCCB->Sccb_scsistat ==SELECT_SN_ST )) { +if (currSCCB->Sccb_scsistat ==SELECT_SN_ST ) { currTar_Info->TarStatus |= (unsigned char )SYNC_SUPPORTED ;
@@ -2953,8 +2953,8 @@ static void FPT_sdecm(unsigned char message, u32 port, unsigned char p_card) ~EE_SYNC_MASK ; } -else if ((currSCCB->Sccb_scsistat == -SELECT_WN_ST )) { +else if (currSCCB->Sccb_scsistat == +SELECT_WN_ST ) { currTar_Info->TarStatus = (currTar_Info->
Signature · 1 line
2.19.0
Quoted 24 lines · Nathan Chancellor
Clang warns when multiple pairs of parentheses are used for a single conditional statement.
In file included from
drivers/scsi/BusLogic.c:57:drivers/scsi/FlashPoint.c:2947:34: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]if ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) { ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
drivers/scsi/FlashPoint.c:2947:34: note: remove extraneous parentheses around the comparison to silence this warning
if ((currSCCB->Sccb_scsistat==SELECT_SN_ST)) {
~ ^ ~drivers/scsi/FlashPoint.c:2947:34: note: use '=' to turn this equality comparison into an assignmentif ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) { ^~ = drivers/scsi/FlashPoint.c:2956:39: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] else if ((currSCCB->Sccb_scsistat == ~~~~~~~~~~~~~~~~~~~~~~~~^~ drivers/scsi/FlashPoint.c:2956:39: note: remove extraneous parentheses around the comparison to silence this warning else if ((currSCCB->Sccb_scsistat == ~ ^ drivers/scsi/FlashPoint.c:2956:39: note: use '=' to turn this equality comparison into an assignment else if ((currSCCB->Sccb_scsistat == ^~ =
Quoted 8 lines
2 warnings generated.
Signed-off-by Nathan Chancellor <[email protected]>--- drivers/scsi/FlashPoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
There are more places in this file with extraneous parentheses, for example:
952 if ((RD_HARPOON(ioport + hp_vendor_id_1) != ORION_VEND_1))
953 return (int)FAILURE;
954
955 if ((RD_HARPOON(ioport + hp_device_id_0) != ORION_DEV_0))
956 return (int)FAILURE;
957
958 if ((RD_HARPOON(ioport + hp_device_id_1) != ORION_DEV_1))
Wonder why the compiler does not complain about these, but this patch is good for now. I will clean up the rest in another patch.
James, Martin, please pull this patch into the scsi tree.
Quoted 44 lines · Khalid Aziz
Quoted 24 lines · Nathan Chancellor
Clang warns when multiple pairs of parentheses are used for a single conditional statement.
In file included from
drivers/scsi/BusLogic.c:57:drivers/scsi/FlashPoint.c:2947:34: warning: equality comparison with extraneous parentheses [-Wparentheses-equality]if ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) { ~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~
drivers/scsi/FlashPoint.c:2947:34: note: remove extraneous parentheses around the comparison to silence this warning
if ((currSCCB->Sccb_scsistat==SELECT_SN_ST)) {
~ ^ ~drivers/scsi/FlashPoint.c:2947:34: note: use '=' to turn this equality comparison into an assignmentif ((currSCCB->Sccb_scsistat == SELECT_SN_ST)) { ^~ = drivers/scsi/FlashPoint.c:2956:39: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] else if ((currSCCB->Sccb_scsistat == ~~~~~~~~~~~~~~~~~~~~~~~~^~ drivers/scsi/FlashPoint.c:2956:39: note: remove extraneous parentheses around the comparison to silence this warning else if ((currSCCB->Sccb_scsistat == ~ ^ drivers/scsi/FlashPoint.c:2956:39: note: use '=' to turn this equality comparison into an assignment else if ((currSCCB->Sccb_scsistat == ^~ =Quoted 8 lines
2 warnings generated.
Signed-off-by Nathan Chancellor <[email protected]>--- drivers/scsi/FlashPoint.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)There are more places in this file with extraneous parentheses, for example:
952 if ((
RD_HARPOON(ioport + hp_vendor_id_1)!=ORION_VEND_1))
953 return (int)FAILURE;
954
955 if ((RD_HARPOON(ioport + hp_device_id_0)!=ORION_DEV_0))
956 return (int)FAILURE;
957
958 if ((RD_HARPOON(ioport + hp_device_id_1)!=ORION_DEV_1))
Quoted 6 lines
Wonder why the compiler does not complain about these, but this patch is good for now. I will clean up the rest in another patch.
James, Martin, please pull this patch into the scsi tree.
Acked-by Khalid Aziz <[email protected]>
Hi Khalid,
Clang only warns about this construct when the left hand is a variable because it thinks that an assignment may have been intended so macros and functions don't trigger it.
Thank you for the review, I appreciate it,
Nathan
Martin K. Petersen
AppliedNathan,
Quoted 2 lines
Clang warns when multiple pairs of parentheses are used for a single conditional statement.
Applied to 4.20/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering