From aa81b9023b964f1a7abc620812ec9dc1e6cf0dfa Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 29 Dec 2020 00:21:49 +0000 Subject: [PATCH 1/2] qla2x00t-32gbit: Remove qla_nvme_ls() return value The function always returns QLA_SUCCESS and the caller qla2x00_start_sp() doesn't even evalute the return value. So there is no point in returning a status. Link: https://lore.kernel.org/r/20200520130819.90625-1-dwagner@suse.de Reviewed-by: Bart Van Assche Reviewed-by: Johannes Thumshirn Reviewed-by: Roman Bolshakov Reviewed-by: Himanshu Madhani Signed-off-by: Daniel Wagner Signed-off-by: Martin K. Petersen See also upstream commit ac988c49367a52b466285239361ede0f74c672da. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9303 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_iocb.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qla2x00t-32gbit/qla_iocb.c b/qla2x00t-32gbit/qla_iocb.c index 97e8f15b7..6ec41f054 100644 --- a/qla2x00t-32gbit/qla_iocb.c +++ b/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 From 5b5a50db9672946f2a907d4065d603fdb0922267 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 29 Dec 2020 00:30:54 +0000 Subject: [PATCH 2/2] qla2x00t-32gbit: Fix the use of whitespace in qla_target.c git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@9304 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_isr.c | 4 ++-- qla2x00t-32gbit/qla_target.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qla2x00t-32gbit/qla_isr.c b/qla2x00t-32gbit/qla_isr.c index 5ab559641..54d5609cc 100644 --- a/qla2x00t-32gbit/qla_isr.c +++ b/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; diff --git a/qla2x00t-32gbit/qla_target.c b/qla2x00t-32gbit/qla_target.c index 1c9ac2e37..198dc2009 100644 --- a/qla2x00t-32gbit/qla_target.c +++ b/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);