| Revision | 4525c8781ec0701ce824e8bd379ae1b129e26568 (tree) |
|---|---|
| Zeit | 2020-10-27 07:45:22 |
| Autor | Linus Torvalds <torvalds@linu...> |
| Commiter | Linus Torvalds |
scsi: qla2xxx: remove incorrect sparse #ifdef
The code to try to shut up sparse warnings about questionable locking
didn't shut up sparse: it made the result not parse as valid C at all,
since the end result now has a label with no statement.
The proper fix is to just always lock the hardware, the same way Bart
did in commit 8ae178760b23 ("scsi: qla2xxx: Simplify the functions for
dumping firmware"). That avoids the whole problem with having locking
that is not statically obvious.
But in the meantime, just remove the incorrect attempt at trying to
avoid a sparse warning that just made things worse.
This was exposed by commit 3e6efab865ac ("scsi: qla2xxx: Fix reset of
MPI firmware"), very similarly to how commit cbb01c2f2f63 ("scsi:
qla2xxx: Fix MPI failure AEN (8200) handling") exposed the same problem
in another place, and caused that commit 8ae178760b23.
Please don't add code to just shut up sparse without actually fixing
what sparse complains about.
Reported-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Arun Easi <aeasi@marvell.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/scsi/qla2xxx/qla_tmpl.c (diff)| @@ -1001,10 +1001,8 @@ qla27xx_mpi_fwdump(scsi_qla_host_t *vha, int hardware_locked) | ||
| 1001 | 1001 | { |
| 1002 | 1002 | ulong flags = 0; |
| 1003 | 1003 | |
| 1004 | -#ifndef __CHECKER__ | |
| 1005 | 1004 | if (!hardware_locked) |
| 1006 | 1005 | spin_lock_irqsave(&vha->hw->hardware_lock, flags); |
| 1007 | -#endif | |
| 1008 | 1006 | if (!vha->hw->mpi_fw_dump) { |
| 1009 | 1007 | ql_log(ql_log_warn, vha, 0x02f3, "-> mpi_fwdump no buffer\n"); |
| 1010 | 1008 | } else { |
| @@ -1050,10 +1048,8 @@ qla27xx_mpi_fwdump(scsi_qla_host_t *vha, int hardware_locked) | ||
| 1050 | 1048 | } |
| 1051 | 1049 | |
| 1052 | 1050 | bailout: |
| 1053 | -#ifndef __CHECKER__ | |
| 1054 | 1051 | if (!hardware_locked) |
| 1055 | 1052 | spin_unlock_irqrestore(&vha->hw->hardware_lock, flags); |
| 1056 | -#endif | |
| 1057 | 1053 | } |
| 1058 | 1054 | |
| 1059 | 1055 | void |
TOMOYO
Fork