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;
 }
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;
 	}
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)
 {