| From: David Hildenbrand <david@redhat.com> |
| Subject: memstick: drop nth_page() usage within SG entry |
| Date: Mon, 1 Sep 2025 17:03:49 +0200 |
| |
| 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. |
| |
| Link: https://lkml.kernel.org/r/20250901150359.867252-29-david@redhat.com |
| Signed-off-by: David Hildenbrand <david@redhat.com> |
| Acked-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Reviewed-by: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> |
| Cc: Maxim Levitsky <maximlevitsky@gmail.com> |
| Cc: Alex Dubov <oakad@yahoo.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| drivers/memstick/host/jmb38x_ms.c | 3 +-- |
| drivers/memstick/host/tifm_ms.c | 3 +-- |
| 2 files changed, 2 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/memstick/host/jmb38x_ms.c~memstick-drop-nth_page-usage-within-sg-entry |
| +++ a/drivers/memstick/host/jmb38x_ms.c |
| @@ -317,8 +317,7 @@ static int jmb38x_ms_transfer_data(struc |
| unsigned int p_off; |
| |
| if (host->req->long_data) { |
| - pg = nth_page(sg_page(&host->req->sg), |
| - off >> PAGE_SHIFT); |
| + pg = sg_page(&host->req->sg) + (off >> PAGE_SHIFT); |
| p_off = offset_in_page(off); |
| p_cnt = PAGE_SIZE - p_off; |
| p_cnt = min(p_cnt, length); |
| --- a/drivers/memstick/host/tifm_ms.c~memstick-drop-nth_page-usage-within-sg-entry |
| +++ a/drivers/memstick/host/tifm_ms.c |
| @@ -201,8 +201,7 @@ static unsigned int tifm_ms_transfer_dat |
| unsigned int p_off; |
| |
| if (host->req->long_data) { |
| - pg = nth_page(sg_page(&host->req->sg), |
| - off >> PAGE_SHIFT); |
| + pg = sg_page(&host->req->sg) + (off >> PAGE_SHIFT); |
| p_off = offset_in_page(off); |
| p_cnt = PAGE_SIZE - p_off; |
| p_cnt = min(p_cnt, length); |
| _ |
