[PATCH] block/partitions/acorn: use min in {riscix,linux}_partition
From: Thorsten Blum
Date: Tue Jun 02 2026 - 12:21:52 EST
Use min() to replace the open-coded implementations and to simplify
riscix_partition() and linux_partition().
Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
---
block/partitions/acorn.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c
index 9f7389f174d0..067d6a27a3bd 100644
--- a/block/partitions/acorn.c
+++ b/block/partitions/acorn.c
@@ -9,6 +9,7 @@
*/
#include <linux/buffer_head.h>
#include <linux/adfs_fs.h>
+#include <linux/minmax.h>
#include "check.h"
@@ -80,7 +81,7 @@ static int riscix_partition(struct parsed_partitions *state,
if (rr->magic == RISCIX_MAGIC) {
- unsigned long size = nr_sects > 2 ? 2 : nr_sects;
+ unsigned long size = min(nr_sects, 2);
int part;
seq_buf_puts(&state->pp_buf, " <");
@@ -124,7 +125,7 @@ static int linux_partition(struct parsed_partitions *state,
{
Sector sect;
struct linux_part *linuxp;
- unsigned long size = nr_sects > 2 ? 2 : nr_sects;
+ unsigned long size = min(nr_sects, 2);
seq_buf_puts(&state->pp_buf, " [Linux]");