| Message ID | 268b3cd5-2388-2553-bdba-c72853f91aa3@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: meson-gx: switch to device-managed dmam_alloc_coherent() | expand |
On Sat, 16 Apr 2022 at 01:12, Heiner Kallweit <hkallweit1@gmail.com> wrote: > > Using the device-managed version allows to simplify clean-up in probe() > error path and remove(). > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/meson-gx-mmc.c | 21 +++++---------------- > 1 file changed, 5 insertions(+), 16 deletions(-) > > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c > index 9f815cfbd..d4134b18d 100644 > --- a/drivers/mmc/host/meson-gx-mmc.c > +++ b/drivers/mmc/host/meson-gx-mmc.c > @@ -1301,8 +1301,8 @@ static int meson_mmc_probe(struct platform_device *pdev) > /* data bounce buffer */ > host->bounce_buf_size = mmc->max_req_size; > host->bounce_buf = > - dma_alloc_coherent(host->dev, host->bounce_buf_size, > - &host->bounce_dma_addr, GFP_KERNEL); > + dmam_alloc_coherent(host->dev, host->bounce_buf_size, > + &host->bounce_dma_addr, GFP_KERNEL); > if (host->bounce_buf == NULL) { > dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); > ret = -ENOMEM; > @@ -1310,12 +1310,12 @@ static int meson_mmc_probe(struct platform_device *pdev) > } > } > > - host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > - &host->descs_dma_addr, GFP_KERNEL); > + host->descs = dmam_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > + &host->descs_dma_addr, GFP_KERNEL); > if (!host->descs) { > dev_err(host->dev, "Allocating descriptor DMA buffer failed\n"); > ret = -ENOMEM; > - goto err_bounce_buf; > + goto err_free_irq; > } > > mmc->ops = &meson_mmc_ops; > @@ -1323,10 +1323,6 @@ static int meson_mmc_probe(struct platform_device *pdev) > > return 0; > > -err_bounce_buf: > - if (!host->dram_access_quirk) > - dma_free_coherent(host->dev, host->bounce_buf_size, > - host->bounce_buf, host->bounce_dma_addr); > err_free_irq: > free_irq(host->irq, host); > err_init_clk: > @@ -1348,13 +1344,6 @@ static int meson_mmc_remove(struct platform_device *pdev) > writel(0, host->regs + SD_EMMC_IRQ_EN); > free_irq(host->irq, host); > > - dma_free_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, > - host->descs, host->descs_dma_addr); > - > - if (!host->dram_access_quirk) > - dma_free_coherent(host->dev, host->bounce_buf_size, > - host->bounce_buf, host->bounce_dma_addr); > - > clk_disable_unprepare(host->mmc_clk); > clk_disable_unprepare(host->core_clk); > > -- > 2.35.3 >
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 9f815cfbd..d4134b18d 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -1301,8 +1301,8 @@ static int meson_mmc_probe(struct platform_device *pdev) /* data bounce buffer */ host->bounce_buf_size = mmc->max_req_size; host->bounce_buf = - dma_alloc_coherent(host->dev, host->bounce_buf_size, - &host->bounce_dma_addr, GFP_KERNEL); + dmam_alloc_coherent(host->dev, host->bounce_buf_size, + &host->bounce_dma_addr, GFP_KERNEL); if (host->bounce_buf == NULL) { dev_err(host->dev, "Unable to map allocate DMA bounce buffer.\n"); ret = -ENOMEM; @@ -1310,12 +1310,12 @@ static int meson_mmc_probe(struct platform_device *pdev) } } - host->descs = dma_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, - &host->descs_dma_addr, GFP_KERNEL); + host->descs = dmam_alloc_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, + &host->descs_dma_addr, GFP_KERNEL); if (!host->descs) { dev_err(host->dev, "Allocating descriptor DMA buffer failed\n"); ret = -ENOMEM; - goto err_bounce_buf; + goto err_free_irq; } mmc->ops = &meson_mmc_ops; @@ -1323,10 +1323,6 @@ static int meson_mmc_probe(struct platform_device *pdev) return 0; -err_bounce_buf: - if (!host->dram_access_quirk) - dma_free_coherent(host->dev, host->bounce_buf_size, - host->bounce_buf, host->bounce_dma_addr); err_free_irq: free_irq(host->irq, host); err_init_clk: @@ -1348,13 +1344,6 @@ static int meson_mmc_remove(struct platform_device *pdev) writel(0, host->regs + SD_EMMC_IRQ_EN); free_irq(host->irq, host); - dma_free_coherent(host->dev, SD_EMMC_DESC_BUF_LEN, - host->descs, host->descs_dma_addr); - - if (!host->dram_access_quirk) - dma_free_coherent(host->dev, host->bounce_buf_size, - host->bounce_buf, host->bounce_dma_addr); - clk_disable_unprepare(host->mmc_clk); clk_disable_unprepare(host->core_clk);
Using the device-managed version allows to simplify clean-up in probe() error path and remove(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- drivers/mmc/host/meson-gx-mmc.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-)