diff options
| author | Martin Wilck | 2018-04-18 01:35:07 +0200 |
|---|---|---|
| committer | Martin K. Petersen | 2018-04-21 01:14:28 +0200 |
| commit | 659c1c1b29ebc4af9148eed74a9f28f00b8b6dc6 (patch) | |
| tree | b7cef1f4b4390c4ea749c4560a1fe390a1710424 | |
| parent | scsi: ilog2: create truly constant version for sparse (diff) | |
| download | kernel-qcow2-linux-659c1c1b29ebc4af9148eed74a9f28f00b8b6dc6.tar.gz kernel-qcow2-linux-659c1c1b29ebc4af9148eed74a9f28f00b8b6dc6.tar.xz kernel-qcow2-linux-659c1c1b29ebc4af9148eed74a9f28f00b8b6dc6.zip | |
scsi: devinfo: use const_ilog2 for array indices
Use the just introduced const_ilog2() macro to avoid sparse errors.
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
| -rw-r--r-- | drivers/scsi/scsi_debugfs.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/scsi_sysfs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_debugfs.c b/drivers/scsi/scsi_debugfs.c index b784002ef0bd..c5a8756384bc 100644 --- a/drivers/scsi/scsi_debugfs.c +++ b/drivers/scsi/scsi_debugfs.c @@ -4,7 +4,7 @@ #include <scsi/scsi_dbg.h> #include "scsi_debugfs.h" -#define SCSI_CMD_FLAG_NAME(name) [ilog2(SCMD_##name)] = #name +#define SCSI_CMD_FLAG_NAME(name)[const_ilog2(SCMD_##name)] = #name static const char *const scsi_cmd_flags[] = { SCSI_CMD_FLAG_NAME(TAGGED), SCSI_CMD_FLAG_NAME(UNCHECKED_ISA_DMA), diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 1e36c9a9ad17..5120e613a29c 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -968,7 +968,7 @@ sdev_show_wwid(struct device *dev, struct device_attribute *attr, static DEVICE_ATTR(wwid, S_IRUGO, sdev_show_wwid, NULL); #define BLIST_FLAG_NAME(name) \ - [ilog2((__force unsigned int)BLIST_##name)] = #name + [const_ilog2((__force unsigned int)BLIST_##name)] = #name static const char *const sdev_bflags_name[] = { #include "scsi_devinfo_tbl.c" }; |