From: Thorsten Blum Date: Thu, 5 Mar 2026 12:25:48 +0000 (+0100) Subject: mmc: sdio: Use min3() to simplify sdio_set_block_size() X-Git-Tag: v7.1-rc1~157^2~46 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c9b6c635148e3dc39ab1411fa5d9762596831ac;p=thirdparty%2Fkernel%2Fstable.git mmc: sdio: Use min3() to simplify sdio_set_block_size() Use min3() to simplify sdio_set_block_size(). Signed-off-by: Thorsten Blum Signed-off-by: Ulf Hansson --- diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c index b774bf51981d0..12716ec0e35d6 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,