Commit 09968e50 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Martin K. Petersen
Browse files

scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb 

Clang warns a few times:

drivers/scsi/3w-sas.c:386:11: warning: implicit conversion from 'int' to
'char' changes value from 128 to -128 [-Wconstant-conversion]
        cdb[4] = TW_ALLOCATION_LENGTH; /* allocation length */
               ~ ^~~~~~~~~~~~~~~~~~~~

Update cdb's type to unsigned char, which matches the type of the cdb
member in struct TW_Command_Apache.

Link: https://github.com/ClangBuiltLinux/linux/issues/158


Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Acked-by: default avatarAdam Radford <aradford@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1b171b1a

drivers/scsi/3w-9xxx.c

+8 −4
Original line number Diff line number Diff line
@@ -143,7 +143,9 @@ static int twa_poll_status_gone(TW_Device_Extension *tw_dev, u32 flag, int secon 
static int twa_post_command_packet(TW_Device_Extension *tw_dev, int request_id, char internal);

static int twa_reset_device_extension(TW_Device_Extension *tw_dev);

static int twa_reset_sequence(TW_Device_Extension *tw_dev, int soft_reset);

static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg);

static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,

				   unsigned char *cdb, int use_sg,

				   TW_SG_Entry *sglistarg);

static void twa_scsiop_execute_scsi_complete(TW_Device_Extension *tw_dev, int request_id);

static char *twa_string_lookup(twa_message_type *table, unsigned int aen_code);
@@ -278,7 +280,7 @@ out: 
static int twa_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)

{

	int request_id = 0;

	char cdb[TW_MAX_CDB_LEN];

	unsigned char cdb[TW_MAX_CDB_LEN];

	TW_SG_Entry sglist[1];

	int finished = 0, count = 0;

	TW_Command_Full *full_command_packet;
@@ -423,7 +425,7 @@ static void twa_aen_queue_event(TW_Device_Extension *tw_dev, TW_Command_Apache_H 
/* This function will read the aen queue from the isr */

static int twa_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)

{

	char cdb[TW_MAX_CDB_LEN];

	unsigned char cdb[TW_MAX_CDB_LEN];

	TW_SG_Entry sglist[1];

	TW_Command_Full *full_command_packet;

	int retval = 1;
@@ -1798,7 +1800,9 @@ out: 
static DEF_SCSI_QCMD(twa_scsi_queue)



/* This function hands scsi cdb's to the firmware */

static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry *sglistarg)

static int twa_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,

				   unsigned char *cdb, int use_sg,

				   TW_SG_Entry *sglistarg)

{

	TW_Command_Full *full_command_packet;

	TW_Command_Apache *command_packet;

drivers/scsi/3w-sas.c

+5 −3
Original line number Diff line number Diff line
@@ -287,7 +287,9 @@ static int twl_post_command_packet(TW_Device_Extension *tw_dev, int request_id) 
} /* End twl_post_command_packet() */



/* This function hands scsi cdb's to the firmware */

static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id, char *cdb, int use_sg, TW_SG_Entry_ISO *sglistarg)

static int twl_scsiop_execute_scsi(TW_Device_Extension *tw_dev, int request_id,

				   unsigned char *cdb, int use_sg,

				   TW_SG_Entry_ISO *sglistarg)

{

	TW_Command_Full *full_command_packet;

	TW_Command_Apache *command_packet;
@@ -372,7 +374,7 @@ out: 
/* This function will read the aen queue from the isr */

static int twl_aen_read_queue(TW_Device_Extension *tw_dev, int request_id)

{

	char cdb[TW_MAX_CDB_LEN];

	unsigned char cdb[TW_MAX_CDB_LEN];

	TW_SG_Entry_ISO sglist[1];

	TW_Command_Full *full_command_packet;

	int retval = 1;
@@ -554,7 +556,7 @@ out: 
static int twl_aen_drain_queue(TW_Device_Extension *tw_dev, int no_check_reset)

{

	int request_id = 0;

	char cdb[TW_MAX_CDB_LEN];

	unsigned char cdb[TW_MAX_CDB_LEN];

	TW_SG_Entry_ISO sglist[1];

	int finished = 0, count = 0;

	TW_Command_Full *full_command_packet;

CRA Git | Maintained and supported by SUSTech CRA and CCSE