nvmet: replace max(a, min(b, c)) by clamp(val, lo, hi)

Li Haoran · keithbusch · commit 64ea88e3afa8 · 2025-03-20T16:53:56.000-07:00
This patch replaces max(a, min(b, c)) by clamp(val, lo, hi) in the nvme
driver. The clamp() macro explicitly expresses the intent of constraining
a value within bounds, improving code readability.

Signed-off-by: Li Haoran &lt;li.haoran7@zte.com.cn&gt;
Signed-off-by: Shao Mingyin &lt;shao.mingyin@zte.com.cn&gt;
Signed-off-by: Keith Busch &lt;kbusch@kernel.org&gt;
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
@@ -828,7 +828,7 @@ static inline u8 nvmet_cc_iocqes(u32 cc)
 /* Convert a 32-bit number to a 16-bit 0's based number */
 static inline __le16 to0based(u32 a)
 {
-	return cpu_to_le16(max(1U, min(1U << 16, a)) - 1);
+	return cpu_to_le16(clamp(a, 1U, 1U << 16) - 1);
 }
 
 static inline bool nvmet_ns_has_pi(struct nvmet_ns *ns)

Original file line number	Diff line number	Diff line change
`@@ -828,7 +828,7 @@ static inline u8 nvmet_cc_iocqes(u32 cc)`
`828`	`828`	`/* Convert a 32-bit number to a 16-bit 0's based number */`
`829`	`829`	`static inline __le16 to0based(u32 a)`
`830`	`830`	`{`
`831`		`- return cpu_to_le16(max(1U, min(1U << 16, a)) - 1);`
	`831`	`+ return cpu_to_le16(clamp(a, 1U, 1U << 16) - 1);`
`832`	`832`	`}`
`833`	`833`
`834`	`834`	`static inline bool nvmet_ns_has_pi(struct nvmet_ns *ns)`