scsi_debug: Remove the set-but-not-used variable "sdebug_any_injecting_opt"
PATCH v2 1/1 scsi_debug: Remove the set-but-not-used variable "sdebug_any_injecting_opt"
The static variable sdebug_any_injecting_opt is no longer read. Commit 3a90a63d02b8 ("scsi: scsi_debug: every_nth triggered error injection") removed all code that reads this variable. Hence, also remove this variable itself. Remove SDEBUG_OPT_ALL_INJECTING because there is no code left that uses this constant if sdebug_any_injecting_opt is removed. This has been detected by building the scsi_debug driver with the git HEAD version of Clang and with W=1.
---
Changes compared to v1:
- Also remove the SDEBUG_OPT_ALL_INJECTING constant.
- Include the name of the sdebug_any_injecting_opt variable in the patch subject.
drivers/scsi/scsi_debug.c | 11 ----------- 1 file changed, 11 deletions(-)
drivers/scsi/scsi_debug.c +0 -11
@@ -233,13 +233,6 @@ struct tape_block {#define SDEBUG_OPT_UNALIGNED_WRITE 0x20000#define SDEBUG_OPT_ALL_NOISE (SDEBUG_OPT_NOISE | SDEBUG_OPT_Q_NOISE | \ SDEBUG_OPT_RESET_NOISE) -#define SDEBUG_OPT_ALL_INJECTING (SDEBUG_OPT_RECOVERED_ERR | \ - SDEBUG_OPT_TRANSPORT_ERR | \ - SDEBUG_OPT_DIF_ERR | SDEBUG_OPT_DIX_ERR | \ - SDEBUG_OPT_SHORT_TRANSFER | \ - SDEBUG_OPT_HOST_BUSY | \ - SDEBUG_OPT_CMD_ABORT | \ - SDEBUG_OPT_UNALIGNED_WRITE)#define SDEBUG_OPT_RECOV_DIF_DIX (SDEBUG_OPT_RECOVERED_ERR | \ SDEBUG_OPT_DIF_ERR | SDEBUG_OPT_DIX_ERR)
@@ -955,7 +948,6 @@ static bool sdebug_removable = DEF_REMOVABLE;static bool sdebug_clustering;static bool sdebug_host_lock =DEF_HOST_LOCK ;static bool sdebug_strict =DEF_STRICT ; -static bool sdebug_any_injecting_opt;static bool sdebug_no_rwlock;static bool sdebug_verbose;static bool have_dif_prot;
@@ -7528,7 +7520,6 @@ static int scsi_debug_write_info(struct Scsi_Host *host, char *buffer,return -EINVAL ; sdebug_opts = opts; sdebug_verbose = !!(SDEBUG_OPT_NOISE & opts); - sdebug_any_injecting_opt = !!(SDEBUG_OPT_ALL_INJECTING & opts);if (sdebug_every_nth !=0 )tweak_cmnd_count ();return length;
@@ -7748,7 +7739,6 @@ static ssize_t opts_store(struct device_driver *ddp, const char *buf, opts_done: sdebug_opts = opts; sdebug_verbose = !!(SDEBUG_OPT_NOISE & opts); - sdebug_any_injecting_opt = !!(SDEBUG_OPT_ALL_INJECTING & opts);tweak_cmnd_count ();return count; }
@@ -9659,7 +9649,6 @@ static int sdebug_driver_probe(struct device *dev)scsi_host_set_guard (hpnt,SHOST_DIX_GUARD_CRC ); sdebug_verbose = !!(SDEBUG_OPT_NOISE & sdebug_opts); - sdebug_any_injecting_opt = !!(SDEBUG_OPT_ALL_INJECTING & sdebug_opts);if (sdebug_every_nth)/* need stats counters for every_nth */ sdebug_statistics = true; error =scsi_add_host (hpnt, &sdbg_host->dev);
Quoted 9 lines · Bart Van Assche
The static variable
sdebug_any_injecting_optis no longer read. Commit3a90a63d02b8("scsi:scsi_debug:every_nthtriggered error injection") removed all code that reads this variable. Hence, also remove this variable itself. RemoveSDEBUG_OPT_ALL_INJECTINGbecause there is no code left that uses this constant ifsdebug_any_injecting_optis removed. This has been detected by building thescsi_debugdriver with the git HEAD version of Clang and with W=1.Signed-off-by Bart Van Assche<[email protected]>
Martin K. Petersen
AppliedBart,
Quoted 7 lines
The static variable
sdebug_any_injecting_optis no longer read. Commit3a90a63d02b8("scsi:scsi_debug:every_nthtriggered error injection") removed all code that reads this variable. Hence, also remove this variable itself. RemoveSDEBUG_OPT_ALL_INJECTINGbecause there is no code left that uses this constant ifsdebug_any_injecting_optis removed. This has been detected by building thescsi_debugdriver with the git HEAD version of Clang and with W=1.
Applied to 7.2/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen
Martin K. Petersen
AppliedQuoted 9 lines · Bart Van Assche
The static variable
sdebug_any_injecting_optis no longer read. Commit3a90a63d02b8("scsi:scsi_debug:every_nthtriggered error injection") removed all code that reads this variable. Hence, also remove this variable itself. RemoveSDEBUG_OPT_ALL_INJECTINGbecause there is no code left that uses this constant ifsdebug_any_injecting_optis removed. This has been detected by building thescsi_debugdriver with the git HEAD version of Clang and with W=1.[...]
Applied to 7.2/scsi-queue, thanks!
[1/1] scsi_debug: Remove the set-but-not-used variable "sdebug_any_injecting_opt"
https://git.kernel.org/mkp/scsi/c/f199cee401f7
Signature · 1 line
Martin K. Petersen