[PATCH 1/2] mmc: sdio: Use min3() to simplify sdio_set_block_size()
From: Thorsten Blum
Date: Thu Mar 05 2026 - 07:29:46 EST
Use min3() to simplify sdio_set_block_size().
Signed-off-by: Thorsten Blum <thorsten.blum@xxxxxxxxx>
---
drivers/mmc/core/sdio_io.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c
index b774bf51981d..12716ec0e35d 100644
--- a/drivers/mmc/core/sdio_io.c
+++ b/drivers/mmc/core/sdio_io.c
@@ -163,10 +163,8 @@ int sdio_set_block_size(struct sdio_func *func, unsigned blksz)
if (blksz > func->card->host->max_blk_size)
return -EINVAL;
- if (blksz == 0) {
- blksz = min(func->max_blksize, func->card->host->max_blk_size);
- blksz = min(blksz, 512u);
- }
+ if (blksz == 0)
+ blksz = min3(func->max_blksize, func->card->host->max_blk_size, 512u);
ret = mmc_io_rw_direct(func->card, 1, 0,
SDIO_FBR_BASE(func->num) + SDIO_FBR_BLKSIZE,
--
Thorsten Blum <thorsten.blum@xxxxxxxxx>
GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4