[PATCH v1 28/36] mmc: drop nth_page() usage within SG entry

[Lorenzo Stoakes]

On Thu, Aug 28, 2025 at 12:01:32AM +0200, David Hildenbrand wrote:
> It's no longer required to use nth_page() when iterating pages within a
> single SG entry, so let's drop the nth_page() usage.
>
> Acked-by: Ulf Hansson <ulf.hansson at linaro.org>
> Cc: Alex Dubov <oakad at yahoo.com>
> Cc: Ulf Hansson <ulf.hansson at linaro.org>
> Cc: Jesper Nilsson <jesper.nilsson at axis.com>
> Cc: Lars Persson <lars.persson at axis.com>
> Signed-off-by: David Hildenbrand <david at redhat.com>

LGTM, so:

Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes at oracle.com>

> ---
>  drivers/mmc/host/tifm_sd.c    | 4 ++--
>  drivers/mmc/host/usdhi6rol0.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
> index ac636efd911d3..2cd69c9e9571b 100644
> --- a/drivers/mmc/host/tifm_sd.c
> +++ b/drivers/mmc/host/tifm_sd.c
> @@ -191,7 +191,7 @@ static void tifm_sd_transfer_data(struct tifm_sd *host)
>  		}
>  		off = sg[host->sg_pos].offset + host->block_pos;
>
> -		pg = nth_page(sg_page(&sg[host->sg_pos]), off >> PAGE_SHIFT);
> +		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);
> @@ -240,7 +240,7 @@ static void tifm_sd_bounce_block(struct tifm_sd *host, struct mmc_data *r_data)
>  		}
>  		off = sg[host->sg_pos].offset + host->block_pos;
>
> -		pg = nth_page(sg_page(&sg[host->sg_pos]), off >> PAGE_SHIFT);
> +		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);
> diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c
> index 85b49c07918b3..3bccf800339ba 100644
> --- a/drivers/mmc/host/usdhi6rol0.c
> +++ b/drivers/mmc/host/usdhi6rol0.c
> @@ -323,7 +323,7 @@ static void usdhi6_blk_bounce(struct usdhi6_host *host,
>
>  	host->head_pg.page	= host->pg.page;
>  	host->head_pg.mapped	= host->pg.mapped;
> -	host->pg.page		= nth_page(host->pg.page, 1);
> +	host->pg.page		= host->pg.page + 1;
>  	host->pg.mapped		= kmap(host->pg.page);
>
>  	host->blk_page = host->bounce_buf;
> @@ -503,7 +503,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host)
>  	/* We cannot get here after crossing a page border */
>
>  	/* Next page in the same SG */
> -	host->pg.page = nth_page(sg_page(host->sg), host->page_idx);
> +	host->pg.page = sg_page(host->sg) + host->page_idx;
>  	host->pg.mapped = kmap(host->pg.page);
>  	host->blk_page = host->pg.mapped;
>
> --
> 2.50.1
>