Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 093b8886 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: core: Use blist_flags_t consistently 



Use the type blist_flags_t for all variables that represent blacklist
flags. Additionally, suppress recently introduced sparse warnings
related to blacklist flags.

[mkp: fixed commit id]

Fixes: 5ebde469 ("scsi: Use 'blist_flags_t' for scsi_devinfo flags")
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.com>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 14e3062f

drivers/scsi/scsi_devinfo.c

+2 −4
Original line number Diff line number Diff line
@@ -374,10 +374,8 @@ int scsi_dev_info_list_add_keyed(int compatible, char *vendor, char *model, 
			    model, compatible);



	if (strflags)

		devinfo->flags = simple_strtoul(strflags, NULL, 0);

	else

		flags = (__force blist_flags_t)simple_strtoul(strflags, NULL, 0);

	devinfo->flags = flags;



	devinfo->compatible = compatible;



	if (compatible)

drivers/scsi/scsi_scan.c

+7 −6
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, 
 *     SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized

 **/

static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,

		int *bflags, int async)

		blist_flags_t *bflags, int async)

{

	int ret;
@@ -1049,14 +1049,15 @@ static unsigned char *scsi_inq_str(unsigned char *buf, unsigned char *inq, 
 *   - SCSI_SCAN_LUN_PRESENT: a new scsi_device was allocated and initialized

 **/

static int scsi_probe_and_add_lun(struct scsi_target *starget,

				  u64 lun, int *bflagsp,

				  u64 lun, blist_flags_t *bflagsp,

				  struct scsi_device **sdevp,

				  enum scsi_scan_mode rescan,

				  void *hostdata)

{

	struct scsi_device *sdev;

	unsigned char *result;

	int bflags, res = SCSI_SCAN_NO_RESPONSE, result_len = 256;

	blist_flags_t bflags;

	int res = SCSI_SCAN_NO_RESPONSE, result_len = 256;

	struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);



	/*
@@ -1201,7 +1202,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, 
 *     Modifies sdevscan->lun.

 **/

static void scsi_sequential_lun_scan(struct scsi_target *starget,

				     int bflags, int scsi_level,

				     blist_flags_t bflags, int scsi_level,

				     enum scsi_scan_mode rescan)

{

	uint max_dev_lun;
@@ -1292,7 +1293,7 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget, 
 *     0: scan completed (or no memory, so further scanning is futile)

 *     1: could not scan with REPORT LUN

 **/

static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,

static int scsi_report_lun_scan(struct scsi_target *starget, blist_flags_t bflags,

				enum scsi_scan_mode rescan)

{

	unsigned char scsi_cmd[MAX_COMMAND_SIZE];
@@ -1538,7 +1539,7 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel, 
		unsigned int id, u64 lun, enum scsi_scan_mode rescan)

{

	struct Scsi_Host *shost = dev_to_shost(parent);

	int bflags = 0;

	blist_flags_t bflags = 0;

	int res;

	struct scsi_target *starget;

drivers/scsi/scsi_sysfs.c

+3 −2
Original line number Diff line number Diff line
@@ -967,7 +967,8 @@ 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(BLIST_##name)] = #name

#define BLIST_FLAG_NAME(name)					\

	[ilog2((__force unsigned int)BLIST_##name)] = #name

static const char *const sdev_bflags_name[] = {

#include "scsi_devinfo_tbl.c"

};
@@ -984,7 +985,7 @@ sdev_show_blacklist(struct device *dev, struct device_attribute *attr, 
	for (i = 0; i < sizeof(sdev->sdev_bflags) * BITS_PER_BYTE; i++) {

		const char *name = NULL;



		if (!(sdev->sdev_bflags & BIT(i)))

		if (!(sdev->sdev_bflags & (__force blist_flags_t)BIT(i)))

			continue;

		if (i < ARRAY_SIZE(sdev_bflags_name) && sdev_bflags_name[i])

			name = sdev_bflags_name[i];

drivers/scsi/scsi_transport_spi.c

+7 −5
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ 


/* Our blacklist flags */

enum {

	SPI_BLIST_NOIUS = 0x1,

	SPI_BLIST_NOIUS = (__force blist_flags_t)0x1,

};



/* blacklist table, modelled on scsi_devinfo.c */

static struct {

	char *vendor;

	char *model;

	unsigned flags;

	blist_flags_t flags;

} spi_static_device_list[] __initdata = {

	{"HP", "Ultrium 3-SCSI", SPI_BLIST_NOIUS },

	{"IBM", "ULTRIUM-TD3", SPI_BLIST_NOIUS },
@@ -221,7 +221,9 @@ static int spi_device_configure(struct transport_container *tc, 
{

	struct scsi_device *sdev = to_scsi_device(dev);

	struct scsi_target *starget = sdev->sdev_target;

	unsigned bflags = scsi_get_device_flags_keyed(sdev, &sdev->inquiry[8],

	blist_flags_t bflags;



	bflags = scsi_get_device_flags_keyed(sdev, &sdev->inquiry[8],

					     &sdev->inquiry[16],

					     SCSI_DEVINFO_SPI);