mmc: sdio: Use min3() to simplify sdio_set_block_size()
Subsystems (2)
PATCH 1/2 mmc: sdio: Use min3() to simplify sdio_set_block_size()
Use min3() to simplify sdio_set_block_size().
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/mmc/core/sdio_io.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mmc/core/sdio_io.c +2 -4
@@ -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,
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
PATCH 2/2 mmc: tifm_sd: Use min3() to simplify tifm_sd_transfer_data()
Use min3() to simplify tifm_sd_transfer_data().
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/mmc/host/tifm_sd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/tifm_sd.c +1 -3
@@ -193,9 +193,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) pg =sg_page (&sg[host->sg_pos]) + (off >>PAGE_SHIFT ); p_off =offset_in_page (off); - p_cnt =PAGE_SIZE - p_off; - p_cnt =min (p_cnt, cnt); - p_cnt =min (p_cnt, t_size); + p_cnt =min3 (PAGE_SIZE - p_off, cnt, t_size);if (r_data->flags &MMC_DATA_READ )tifm_sd_read_fifo (host, pg, p_off, p_cnt);
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
Quoted 4 lines · Thorsten Blum
Use
min3()to simplifysdio_set_block_size().Signed-off-by Thorsten Blum <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 25 lines
--- drivers/mmc/core/sdio_io.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/mmc/core/sdio_io.c +2
-5@@ -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 <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
Re: [PATCH 2/2] mmc: tifm_sd: Use min3() to simplify tifm_sd_transfer_data()
In reply to Thorsten BlumQuoted 4 lines · Thorsten Blum
Use
min3()to simplifytifm_sd_transfer_data().Signed-off-by Thorsten Blum <[email protected]>
Applied for next, thanks!
Kind regards
Uffe
Quoted 23 lines
--- drivers/mmc/host/tifm_sd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)drivers/mmc/host/tifm_sd.c +1
-4@@ -193,9 +193,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host) pg =sg_page (&sg[host->sg_pos]) + (off >>PAGE_SHIFT ); p_off =offset_in_page (off); - p_cnt =PAGE_SIZE - p_off; - p_cnt =min (p_cnt, cnt); - p_cnt =min (p_cnt, t_size); + p_cnt =min3 (PAGE_SIZE - p_off, cnt, t_size);if (r_data->flags &MMC_DATA_READ )tifm_sd_read_fifo (host, pg, p_off, p_cnt); --Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4