Commit 8840e1c1 authored by Wolfram Sang's avatar Wolfram Sang Committed by Ulf Hansson
Browse files

mmc: tmio: remove tmio_mmc_k(un)map_atomic helpers 



After a8402aed8ca5 ("mmc: tmio_mmc_core: Remove
local_irq_{save,restore}() around k[un]map_atomic()") and ac91578a6812
("mmc: tmio_mmc_core: Replace kmap_atomic() with kmap_local_page()"),
the helpers contain just a single call. Putting it directly in the code
makes it actually more readable. More so, because we now avoid the
'offset' calculation when mapping/unmapping and just use it when we need
it in the copy routines.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20221102125430.28466-2-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent c330601c

drivers/mmc/host/renesas_sdhi_sys_dmac.c

+3 −3
Original line number Diff line number Diff line
@@ -254,11 +254,11 @@ static void renesas_sdhi_sys_dmac_start_dma_tx(struct tmio_mmc_host *host) 


	/* The only sg element can be unaligned, use our bounce buffer then */

	if (!aligned) {

		void *sg_vaddr = tmio_mmc_kmap_atomic(sg);

		void *sg_vaddr = kmap_local_page(sg_page(sg));



		sg_init_one(&host->bounce_sg, host->bounce_buf, sg->length);

		memcpy(host->bounce_buf, sg_vaddr, host->bounce_sg.length);

		tmio_mmc_kunmap_atomic(sg, sg_vaddr);

		memcpy(host->bounce_buf, sg_vaddr + sg->offset, host->bounce_sg.length);

		kunmap_local(sg_vaddr);

		host->sg_ptr = &host->bounce_sg;

		sg = host->sg_ptr;

	}

drivers/mmc/host/tmio_mmc.h

+0 −11
Original line number Diff line number Diff line
@@ -205,17 +205,6 @@ void tmio_mmc_enable_mmc_irqs(struct tmio_mmc_host *host, u32 i); 
void tmio_mmc_disable_mmc_irqs(struct tmio_mmc_host *host, u32 i);

irqreturn_t tmio_mmc_irq(int irq, void *devid);



static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg)

{

	return kmap_local_page(sg_page(sg)) + sg->offset;

}



static inline void tmio_mmc_kunmap_atomic(struct scatterlist *sg,

					  void *virt)

{

	kunmap_local(virt - sg->offset);

}



#ifdef CONFIG_PM

int tmio_mmc_host_runtime_suspend(struct device *dev);

int tmio_mmc_host_runtime_resume(struct device *dev);

drivers/mmc/host/tmio_mmc_core.c

+7 −6
Original line number Diff line number Diff line
@@ -421,8 +421,8 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) 
		return;

	}



	sg_virt = tmio_mmc_kmap_atomic(host->sg_ptr);

	buf = (unsigned short *)(sg_virt + host->sg_off);

	sg_virt = kmap_local_page(sg_page(host->sg_ptr));

	buf = (unsigned short *)(sg_virt + host->sg_ptr->offset + host->sg_off);



	count = host->sg_ptr->length - host->sg_off;

	if (count > data->blksz)
@@ -436,7 +436,7 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) 


	host->sg_off += count;



	tmio_mmc_kunmap_atomic(host->sg_ptr, sg_virt);

	kunmap_local(sg_virt);



	if (host->sg_off == host->sg_ptr->length)

		tmio_mmc_next_sg(host);
@@ -445,10 +445,11 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host) 
static void tmio_mmc_check_bounce_buffer(struct tmio_mmc_host *host)

{

	if (host->sg_ptr == &host->bounce_sg) {

		void *sg_vaddr = tmio_mmc_kmap_atomic(host->sg_orig);

		void *sg_virt = kmap_local_page(sg_page(host->sg_orig));



		memcpy(sg_vaddr, host->bounce_buf, host->bounce_sg.length);

		tmio_mmc_kunmap_atomic(host->sg_orig, sg_vaddr);

		memcpy(sg_virt + host->sg_orig->offset, host->bounce_buf,

		       host->bounce_sg.length);

		kunmap_local(sg_virt);

	}

}