lkml.org 
[lkml]   [2018]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 04/16] mmc: tmio: remove dma_ops from tmio_mmc_host_probe() argument
    Date
    Drivers need to set up various struct members for tmio_mmc_host before
    calling tmio_mmc_host_probe(). Do likewise for host->dma_ops instead
    of passing it as a function argument.

    Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
    Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
    ---

    Changes in v3: None
    Changes in v2: None

    drivers/mmc/host/renesas_sdhi_core.c | 3 ++-
    drivers/mmc/host/tmio_mmc.c | 2 +-
    drivers/mmc/host/tmio_mmc.h | 3 +--
    drivers/mmc/host/tmio_mmc_core.c | 4 +---
    4 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c
    index e18a1c5..80943fa 100644
    --- a/drivers/mmc/host/renesas_sdhi_core.c
    +++ b/drivers/mmc/host/renesas_sdhi_core.c
    @@ -532,6 +532,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
    host->clk_update = renesas_sdhi_clk_update;
    host->clk_disable = renesas_sdhi_clk_disable;
    host->multi_io_quirk = renesas_sdhi_multi_io_quirk;
    + host->dma_ops = dma_ops;

    /* SDR speeds are only available on Gen2+ */
    if (mmc_data->flags & TMIO_MMC_MIN_RCAR2) {
    @@ -575,7 +576,7 @@ int renesas_sdhi_probe(struct platform_device *pdev,
    if (ret)
    goto efree;

    - ret = tmio_mmc_host_probe(host, dma_ops);
    + ret = tmio_mmc_host_probe(host);
    if (ret < 0)
    goto edisclk;

    diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
    index 11b87ce..43a2ea5 100644
    --- a/drivers/mmc/host/tmio_mmc.c
    +++ b/drivers/mmc/host/tmio_mmc.c
    @@ -104,7 +104,7 @@ static int tmio_mmc_probe(struct platform_device *pdev)
    host->mmc->f_max = pdata->hclk;
    host->mmc->f_min = pdata->hclk / 512;

    - ret = tmio_mmc_host_probe(host, NULL);
    + ret = tmio_mmc_host_probe(host);
    if (ret)
    goto host_free;

    diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
    index f46d282..7609434 100644
    --- a/drivers/mmc/host/tmio_mmc.h
    +++ b/drivers/mmc/host/tmio_mmc.h
    @@ -198,8 +198,7 @@ struct tmio_mmc_host {
    struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev,
    struct tmio_mmc_data *pdata);
    void tmio_mmc_host_free(struct tmio_mmc_host *host);
    -int tmio_mmc_host_probe(struct tmio_mmc_host *host,
    - const struct tmio_mmc_dma_ops *dma_ops);
    +int tmio_mmc_host_probe(struct tmio_mmc_host *host);
    void tmio_mmc_host_remove(struct tmio_mmc_host *host);
    void tmio_mmc_do_data_irq(struct tmio_mmc_host *host);

    diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c
    index fc9b28d..d092b0f 100644
    --- a/drivers/mmc/host/tmio_mmc_core.c
    +++ b/drivers/mmc/host/tmio_mmc_core.c
    @@ -1195,8 +1195,7 @@ void tmio_mmc_host_free(struct tmio_mmc_host *host)
    }
    EXPORT_SYMBOL_GPL(tmio_mmc_host_free);

    -int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
    - const struct tmio_mmc_dma_ops *dma_ops)
    +int tmio_mmc_host_probe(struct tmio_mmc_host *_host)
    {
    struct platform_device *pdev = _host->pdev;
    struct tmio_mmc_data *pdata = _host->pdata;
    @@ -1296,7 +1295,6 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host,
    INIT_WORK(&_host->done, tmio_mmc_done_work);

    /* See if we also get DMA */
    - _host->dma_ops = dma_ops;
    tmio_mmc_request_dma(_host, pdata);

    pm_runtime_set_active(&pdev->dev);
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-01-18 00:21    [W:4.243 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site