lkml.org 
[lkml]   [2018]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 2/6] scsi: use const_ilog2 for array indices
    Date
    Use the just introduced const_ilog2() macro to avoid sparse
    errors.

    Signed-off-by: Martin Wilck <mwilck@suse.com>
    ---
    drivers/scsi/scsi_debugfs.c | 2 +-
    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 b784002..c5a8756 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 e56a4ac..feacd7a 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"
    };
    --
    2.16.1
    \
     
     \ /
      Last update: 2018-04-18 01:36    [W:4.966 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site