lkml.org 
[lkml]   [2018]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/46] dmaengine: tegra20-apb-dma: use helper dmaenginem_async_device_register
    Date
    Use dmaenginem_async_device_register to simplify the code:
    remove dma_async_device_unregister
    remove the label err_unregister_dma_dev

    Signed-off-by: Huang Shijie <sjhuang@iluvatar.ai>
    ---
    drivers/dma/tegra20-apb-dma.c | 8 ++------
    1 file changed, 2 insertions(+), 6 deletions(-)

    diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
    index 9a558e30c461..9f6f51abbeef 100644
    --- a/drivers/dma/tegra20-apb-dma.c
    +++ b/drivers/dma/tegra20-apb-dma.c
    @@ -1444,7 +1444,7 @@ static int tegra_dma_probe(struct platform_device *pdev)
    tdma->dma_dev.device_tx_status = tegra_dma_tx_status;
    tdma->dma_dev.device_issue_pending = tegra_dma_issue_pending;

    - ret = dma_async_device_register(&tdma->dma_dev);
    + ret = dmaenginem_async_device_register(&tdma->dma_dev);
    if (ret < 0) {
    dev_err(&pdev->dev,
    "Tegra20 APB DMA driver registration failed %d\n", ret);
    @@ -1456,15 +1456,13 @@ static int tegra_dma_probe(struct platform_device *pdev)
    if (ret < 0) {
    dev_err(&pdev->dev,
    "Tegra20 APB DMA OF registration failed %d\n", ret);
    - goto err_unregister_dma_dev;
    + goto err_irq;
    }

    dev_info(&pdev->dev, "Tegra20 APB DMA driver register %d channels\n",
    cdata->nr_channels);
    return 0;

    -err_unregister_dma_dev:
    - dma_async_device_unregister(&tdma->dma_dev);
    err_irq:
    while (--i >= 0) {
    struct tegra_dma_channel *tdc = &tdma->channels[i];
    @@ -1485,8 +1483,6 @@ static int tegra_dma_remove(struct platform_device *pdev)
    int i;
    struct tegra_dma_channel *tdc;

    - dma_async_device_unregister(&tdma->dma_dev);
    -
    for (i = 0; i < tdma->chip_data->nr_channels; ++i) {
    tdc = &tdma->channels[i];
    free_irq(tdc->irq, tdc);
    --
    2.17.1
    \
     
     \ /
      Last update: 2018-08-03 09:26    [W:5.843 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site