Skip to contentSkip to conversation

mmc: sdio: Use min3() to simplify sdio_set_block_size()

PATCH In review Thorsten Blum 2 participants 4 messages Mar 5 – Mar 9

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mmc: sdio: Use min3() to simplify sdio_set_block_size()

Use min3() to simplify sdio_set_block_size().

---
 drivers/mmc/core/sdio_io.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/mmc/core/sdio_io.c +2 -4
index b774bf51981d..12716ec0e35d 100644
@@ -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
#1 lore raw

PATCH 2/2 mmc: tifm_sd: Use min3() to simplify tifm_sd_transfer_data()

Use min3() to simplify tifm_sd_transfer_data().

---
 drivers/mmc/host/tifm_sd.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/mmc/host/tifm_sd.c +1 -3
index 2cd69c9e9571..c1f7d5b37911 100644
@@ -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
#3 lore raw
In reply to Thorsten Blum
Quoted 4 lines · Thorsten Blum

Use min3() to simplify sdio_set_block_size().

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
index b774bf51981d..12716ec0e35d 100644
@@ -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

#2 lore raw

Re: [PATCH 2/2] mmc: tifm_sd: Use min3() to simplify tifm_sd_transfer_data()

In reply to Thorsten Blum
Quoted 4 lines · Thorsten Blum

Use min3() to simplify tifm_sd_transfer_data().

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
index 2cd69c9e9571..c1f7d5b37911 100644
@@ -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