Commit af102b33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull more SCSI updates from James Bottomley:
 "This is a set of minor small (and safe changes) that didn't make the
  initial pull request plus some bug fixes"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: mvsas: Remove set but not used variable 'id'
  scsi: qla2xxx: Remove two arguments from qlafx00_error_entry()
  scsi: qla2xxx: Make sure that qlafx00_ioctl_iosb_entry() initializes 'res'
  scsi: qla2xxx: Remove a set-but-not-used variable
  scsi: qla2xxx: Make qla2x00_sysfs_write_nvram() easier to analyze
  scsi: qla2xxx: Declare local functions 'static'
  scsi: qla2xxx: Improve several kernel-doc headers
  scsi: qla2xxx: Modify fall-through annotations
  scsi: 3w-sas: 3w-9xxx: Use unsigned char for cdb
  scsi: mvsas: Use dma_pool_zalloc
  scsi: target: Don't request modules that aren't even built
  scsi: target: Set response length for REPORT TARGET PORT GROUPS
parents cddfa11a 33279c30

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;

drivers/scsi/mvsas/mv_sas.c

+2 −4
Original line number Diff line number Diff line
@@ -790,12 +790,11 @@ static int mvs_task_prep(struct sas_task *task, struct mvs_info *mvi, int is_tmf 
	slot->n_elem = n_elem;

	slot->slot_tag = tag;



	slot->buf = dma_pool_alloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);

	slot->buf = dma_pool_zalloc(mvi->dma_pool, GFP_ATOMIC, &slot->buf_dma);

	if (!slot->buf) {

		rc = -ENOMEM;

		goto err_out_tag;

	}

	memset(slot->buf, 0, MVS_SLOT_BUF_SZ);



	tei.task = task;

	tei.hdr = &mvi->slot[tag];
@@ -1906,8 +1905,7 @@ static void mvs_work_queue(struct work_struct *work) 


		if (phy->phy_event & PHY_PLUG_OUT) {

			u32 tmp;

			struct sas_identify_frame *id;

			id = (struct sas_identify_frame *)phy->frame_rcvd;



			tmp = MVS_CHIP_DISP->read_phy_ctl(mvi, phy_no);

			phy->phy_event &= ~PHY_PLUG_OUT;

			if (!(tmp & PHY_READY_MASK)) {

drivers/scsi/qla2xxx/qla_attr.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ qla2x00_sysfs_write_nvram(struct file *filp, struct kobject *kobj, 


	mutex_lock(&ha->optrom_mutex);

	if (qla2x00_chip_is_down(vha)) {

		mutex_unlock(&vha->hw->optrom_mutex);

		mutex_unlock(&ha->optrom_mutex);

		return -EAGAIN;

	}

drivers/scsi/qla2xxx/qla_init.c

+4 −3
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ void qla24xx_handle_adisc_event(scsi_qla_host_t *vha, struct event_arg *ea) 
	__qla24xx_handle_gpdb_event(vha, ea);

}



int qla_post_els_plogi_work(struct scsi_qla_host *vha, fc_port_t *fcport)

static int qla_post_els_plogi_work(struct scsi_qla_host *vha, fc_port_t *fcport)

{

	struct qla_work_evt *e;
@@ -680,7 +680,7 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, 
					    fcport);

					break;

				}

				/* drop through */

				/* fall through */

			default:

				if (fcport_is_smaller(fcport)) {

					/* local adapter is bigger */
@@ -1551,7 +1551,8 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha, 
}





void qla_handle_els_plogi_done(scsi_qla_host_t *vha, struct event_arg *ea)

static void qla_handle_els_plogi_done(scsi_qla_host_t *vha,

				      struct event_arg *ea)

{

	ql_dbg(ql_dbg_disc, vha, 0x2118,

	    "%s %d %8phC post PRLI\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE