diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c
index c8285844f..31c64ee82 100644
--- a/iscsi-scst/kernel/iscsi.c
+++ b/iscsi-scst/kernel/iscsi.c
@@ -3955,7 +3955,7 @@ int iscsi_threads_pool_get(const cpumask_t *cpu_mask,
 	INIT_LIST_HEAD(&p->threads_list);
 
 	if (cpu_mask == NULL)
-		count = max((int)num_online_cpus(), 2);
+		count = max_t(int, num_online_cpus(), 2);
 	else {
 		count = 0;
 		for_each_cpu(i, cpu_mask)
diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c
index 240996f4f..7ede615ee 100644
--- a/qla2x00t/qla2x00-target/qla2x00t.c
+++ b/qla2x00t/qla2x00-target/qla2x00t.c
@@ -2583,8 +2583,8 @@ static void q2x_init_ctio_ret_entry(ctio_ret_entry_t *ctio_m1,
 {
 	TRACE_ENTRY();
 
-	prm->sense_buffer_len = min((uint32_t)prm->sense_buffer_len,
-				    (uint32_t)sizeof(ctio_m1->sense_data));
+	prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
+				      sizeof(ctio_m1->sense_data));
 
 	ctio_m1->flags = cpu_to_le16(OF_SSTS | OF_FAST_POST |
 				     OF_NO_DATA | OF_SS_MODE_1);
@@ -2790,8 +2790,8 @@ static void q24_init_ctio_ret_entry(ctio7_status0_entry_t *ctio,
 
 	TRACE_ENTRY();
 
-	prm->sense_buffer_len = min((uint32_t)prm->sense_buffer_len,
-				    (uint32_t)sizeof(ctio1->sense_data));
+	prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
+				      sizeof(ctio1->sense_data));
 	ctio->flags |= cpu_to_le16(CTIO7_FLAGS_SEND_STATUS);
 	if (q2t_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) {
 		ctio->flags |= cpu_to_le16(