Merge branch 'svn-trunk'

qla2x00t-32gbit/qla_iocb.c

@@ -3661,11 +3661,10 @@ static void qla2x00_send_notify_ack_iocb(srb_t *sp,
 /*
  * Build NVME LS request
  */
-static int
+static void
 qla_nvme_ls(srb_t *sp, struct pt_ls4_request *cmd_pkt)
 {
 	struct srb_iocb *nvme;
-	int     rval = QLA_SUCCESS;
 
 	nvme = &sp->u.iocb_cmd;
 	cmd_pkt->entry_type = PT_LS4_REQUEST;
@@ -3685,8 +3684,6 @@ qla_nvme_ls(srb_t *sp, struct pt_ls4_request *cmd_pkt)
 	cmd_pkt->rx_byte_count = cpu_to_le32(nvme->u.nvme.rsp_len);
 	cmd_pkt->dsd[1].length = cpu_to_le32(nvme->u.nvme.rsp_len);
 	put_unaligned_le64(nvme->u.nvme.rsp_dma, &cmd_pkt->dsd[1].address);
-
-	return rval;
 }
 
 static void

qla2x00t-32gbit/qla_isr.c

@@ -855,8 +855,8 @@ qla24xx_queue_purex_item(scsi_qla_host_t *vha, struct purex_item *pkt,
  * @vha: SCSI driver HA context
  * @pkt: ELS packet
  */
-static struct purex_item *
-qla24xx_copy_std_pkt(struct scsi_qla_host *vha, void *pkt)
+static struct purex_item
+*qla24xx_copy_std_pkt(struct scsi_qla_host *vha, void *pkt)
 {
 	struct purex_item *item;
 

qla2x00t-32gbit/qla_target.c

@@ -2129,7 +2129,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
 #endif
 
 	abort_cmd = ha->tgt.tgt_ops->find_cmd_by_tag(sess,
- 				le32_to_cpu(abts->exchange_addr_to_abort));
+				le32_to_cpu(abts->exchange_addr_to_abort));
 	if (!abort_cmd)
 		return -EIO;
 	mcmd->unpacked_lun = abort_cmd->se_cmd.orig_fe_lun;
@@ -2139,8 +2139,8 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
 		mcmd->se_cmd.cpuid = abort_cmd->se_cmd.cpuid;
 		mcmd->abort_io_attr = abort_cmd->atio.u.isp24.attr;
 		mcmd->flags = QLA24XX_MGMT_ABORT_IO_ATTR_VALID;
- 	}
- 
+	}
+
 	INIT_WORK(&mcmd->work, qlt_do_tmr_work);
 #if HAVE_SE_CMD_CPUID
 	queue_work_on(mcmd->se_cmd.cpuid, qla_tgt_wq, &mcmd->work);