lkml.org 
[lkml]   [2020]   [Aug]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 57/92] mmc: renesas_sdhi_internal_dmac: clean up the code for dma complete
    Date
    From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

    [ Upstream commit 2b26e34e9af3fa24fa1266e9ea2d66a1f7d62dc0 ]

    To add end() operation in the future, clean the code of
    renesas_sdhi_internal_dmac_complete_tasklet_fn(). No behavior change.

    Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
    Link: https://lore.kernel.org/r/1590044466-28372-3-git-send-email-yoshihiro.shimoda.uh@renesas.com
    Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mmc/host/renesas_sdhi_internal_dmac.c | 18 +++++++++++++-----
    1 file changed, 13 insertions(+), 5 deletions(-)

    diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
    index 382172fb3da8f..74eea8247490d 100644
    --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c
    +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c
    @@ -222,15 +222,12 @@ static void renesas_sdhi_internal_dmac_issue_tasklet_fn(unsigned long arg)
    DTRAN_CTRL_DM_START);
    }

    -static void renesas_sdhi_internal_dmac_complete_tasklet_fn(unsigned long arg)
    +static bool renesas_sdhi_internal_dmac_complete(struct tmio_mmc_host *host)
    {
    - struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg;
    enum dma_data_direction dir;

    - spin_lock_irq(&host->lock);
    -
    if (!host->data)
    - goto out;
    + return false;

    if (host->data->flags & MMC_DATA_READ)
    dir = DMA_FROM_DEVICE;
    @@ -243,6 +240,17 @@ static void renesas_sdhi_internal_dmac_complete_tasklet_fn(unsigned long arg)
    if (dir == DMA_FROM_DEVICE)
    clear_bit(SDHI_INTERNAL_DMAC_RX_IN_USE, &global_flags);

    + return true;
    +}
    +
    +static void renesas_sdhi_internal_dmac_complete_tasklet_fn(unsigned long arg)
    +{
    + struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg;
    +
    + spin_lock_irq(&host->lock);
    + if (!renesas_sdhi_internal_dmac_complete(host))
    + goto out;
    +
    tmio_mmc_do_data_irq(host);
    out:
    spin_unlock_irq(&host->lock);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-08-20 14:24    [W:4.056 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site