From 01e4a661ffbedf189576718adeef93535fb016ca Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 31 May 2019 01:44:41 +0000 Subject: [PATCH 1/3] qla2x00t-32gbit: Improve coding style conformance git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8401 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c index f2de74030..1f576d8ae 100644 --- a/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c +++ b/qla2x00t-32gbit/qla2x00-target/scst_qla2xxx.c @@ -493,7 +493,7 @@ static int sqa_qla2xxx_handle_cmd(scsi_qla_host_t *vha, /* we're being call by wq, so do direct */ scst_cmd_init_done(cmd->scst_cmd, SCST_CONTEXT_DIRECT); - out: +out: TRACE_EXIT_RES(res); return res; } @@ -669,7 +669,7 @@ static int sqa_qla2xxx_handle_tmr(struct qla_tgt_mgmt_cmd *mcmd, u64 lun, res = -EFAULT; } - done: +done: TRACE_EXIT_RES(res); return res; } From 0344c589419a84ae8b330021ea363229031c09e8 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 31 May 2019 01:45:27 +0000 Subject: [PATCH 2/3] qla2x00t-32gbit: Use tabs instead of spaces for indentation git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8402 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/qla_bsg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qla2x00t-32gbit/qla_bsg.c b/qla2x00t-32gbit/qla_bsg.c index 7455b7a9d..78f10d967 100644 --- a/qla2x00t-32gbit/qla_bsg.c +++ b/qla2x00t-32gbit/qla_bsg.c @@ -382,7 +382,7 @@ static int qla2x00_process_els(struct bsg_job *bsg_job) rsp_sg_cnt = dma_map_sg(&ha->pdev->dev, bsg_job->reply_payload.sg_list, bsg_job->reply_payload.sg_cnt, DMA_FROM_DEVICE); - if (!rsp_sg_cnt) { + if (!rsp_sg_cnt) { rval = -ENOMEM; goto done_free_fcport; } From c03d826b9554af38ad862d9aa4b31ddbc658c2b5 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Fri, 31 May 2019 01:56:57 +0000 Subject: [PATCH 3/3] scst/include/backport.h: Modifications for script/specialize-patch git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8403 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scst/include/backport.h b/scst/include/backport.h index 853faf8ea..11bf6bcc2 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -907,7 +907,7 @@ static inline void *kvzalloc(size_t size, gfp_t flags) #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && \ (!defined(MOFED_MAJOR) || !defined(MOFED_MINOR) || \ - MOFED_MAJOR < 4 || (MOFED_MAJOR == 4 && MOFED_MINOR < 5)) + MOFED_MAJOR -0 < 4 || (MOFED_MAJOR -0 == 4 && MOFED_MINOR -0 < 5)) /* See also commit 1c542f38ab8d ("mm: Introduce kvcalloc()") # v4.18. */ static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) {