]> git.itanic.dy.fi Git - linux-stable/commitdiff
mmc: au1xmmc: Replace kmap_atomic() with kmap_local_page()
authorAdrian Hunter <adrian.hunter@intel.com>
Wed, 5 Oct 2022 10:19:50 +0000 (13:19 +0300)
committerUlf Hansson <ulf.hansson@linaro.org>
Wed, 7 Dec 2022 12:22:33 +0000 (13:22 +0100)
kmap_local_page() is equivalent to kmap_atomic() except that it does not
disable page faults or preemption. Where possible kmap_local_page() is
preferred to kmap_atomic() - refer kernel highmem documentation.

In this case, there is no need to disable page faults or preemption, so
replace kmap_atomic() with kmap_local_page(), and, correspondingly,
kunmap_atomic() with kunmap_local().

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20221005101951.3165-14-adrian.hunter@intel.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/au1xmmc.c

index c88b039dc9fbd07fb4ad2358121680c5dee648cc..82dd0ae40305a3e95bcc0b7f17938bb5e8580bed 100644 (file)
@@ -388,7 +388,7 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)
 
        /* This is the pointer to the data buffer */
        sg = &data->sg[host->pio.index];
-       sg_ptr = kmap_atomic(sg_page(sg)) + sg->offset + host->pio.offset;
+       sg_ptr = kmap_local_page(sg_page(sg)) + sg->offset + host->pio.offset;
 
        /* This is the space left inside the buffer */
        sg_len = data->sg[host->pio.index].length - host->pio.offset;
@@ -409,7 +409,7 @@ static void au1xmmc_send_pio(struct au1xmmc_host *host)
                __raw_writel((unsigned long)val, HOST_TXPORT(host));
                wmb(); /* drain writebuffer */
        }
-       kunmap_atomic(sg_ptr);
+       kunmap_local(sg_ptr);
 
        host->pio.len -= count;
        host->pio.offset += count;
@@ -446,7 +446,7 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)
 
        if (host->pio.index < host->dma.len) {
                sg = &data->sg[host->pio.index];
-               sg_ptr = kmap_atomic(sg_page(sg)) + sg->offset + host->pio.offset;
+               sg_ptr = kmap_local_page(sg_page(sg)) + sg->offset + host->pio.offset;
 
                /* This is the space left inside the buffer */
                sg_len = sg_dma_len(&data->sg[host->pio.index]) - host->pio.offset;
@@ -488,7 +488,7 @@ static void au1xmmc_receive_pio(struct au1xmmc_host *host)
                        sg_ptr[count] = (unsigned char)(val & 0xFF);
        }
        if (sg_ptr)
-               kunmap_atomic(sg_ptr);
+               kunmap_local(sg_ptr);
 
        host->pio.len -= count;
        host->pio.offset += count;