]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mmc: sdio: Use min3() to simplify sdio_set_block_size()
authorThorsten Blum <thorsten.blum@linux.dev>
Thu, 5 Mar 2026 12:25:48 +0000 (13:25 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 9 Mar 2026 13:24:35 +0000 (14:24 +0100)
Use min3() to simplify sdio_set_block_size().

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/core/sdio_io.c

index b774bf51981d05a446d5c48c0b0d4f54840f7b09..12716ec0e35d6156cc2503fb019b962bf2caf354 100644 (file)
@@ -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,