From: Huang Shijie <sjhuang@iluvatar.ai>
To: vkoul@kernel.org
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
dave.jiang@intel.com, radhey.shyam.pandey@xilinx.com,
appana.durga.rao@xilinx.com, jmkrzyszt@gmail.com,
gomonovych@gmail.com, peter.ujfalusi@ti.com,
keescook@chromium.org, horms+renesas@verge.net.au,
geert+renesas@glider.be, shawnguo@kernel.org,
baoyou.xie@linaro.org, michal.simek@xilinx.com,
baohua@kernel.org, ludovic.desroches@microchip.com,
linus.walleij@linaro.org, david.brown@linaro.org,
Huang Shijie <sjhuang@iluvatar.ai>
Subject: [38/46] dmaengine: imx-dma: use dmaenginem_async_device_register to simplify the code
Date: Fri, 3 Aug 2018 15:20:08 +0800 [thread overview]
Message-ID: <20180803072016.21544-39-sjhuang@iluvatar.ai> (raw)
Use dmaenginem_async_device_register to simplify the code:
remove dma_async_device_unregister.
remove label err_of_dma_controller
Signed-off-by: Huang Shijie <sjhuang@iluvatar.ai>
---
drivers/dma/imx-dma.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 75b6ff0415ee..d651fbea77ee 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -1186,7 +1186,7 @@ static int __init imxdma_probe(struct platform_device *pdev)
imxdma->dma_device.dev->dma_parms = &imxdma->dma_parms;
dma_set_max_seg_size(imxdma->dma_device.dev, 0xffffff);
- ret = dma_async_device_register(&imxdma->dma_device);
+ ret = dmaenginem_async_device_register(&imxdma->dma_device);
if (ret) {
dev_err(&pdev->dev, "unable to register\n");
goto disable_dma_ahb_clk;
@@ -1197,14 +1197,12 @@ static int __init imxdma_probe(struct platform_device *pdev)
imxdma_xlate, imxdma);
if (ret) {
dev_err(&pdev->dev, "unable to register of_dma_controller\n");
- goto err_of_dma_controller;
+ goto disable_dma_ahb_clk;
}
}
return 0;
-err_of_dma_controller:
- dma_async_device_unregister(&imxdma->dma_device);
disable_dma_ahb_clk:
clk_disable_unprepare(imxdma->dma_ahb);
disable_dma_ipg_clk:
@@ -1237,8 +1235,6 @@ static int imxdma_remove(struct platform_device *pdev)
imxdma_free_irq(pdev, imxdma);
- dma_async_device_unregister(&imxdma->dma_device);
-
if (pdev->dev.of_node)
of_dma_controller_free(pdev->dev.of_node);
reply other threads:[~2018-08-03 7:20 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180803072016.21544-39-sjhuang@iluvatar.ai \
--to=sjhuang@iluvatar.ai \
--cc=appana.durga.rao@xilinx.com \
--cc=baohua@kernel.org \
--cc=baoyou.xie@linaro.org \
--cc=dave.jiang@intel.com \
--cc=david.brown@linaro.org \
--cc=dmaengine@vger.kernel.org \
--cc=geert+renesas@glider.be \
--cc=gomonovych@gmail.com \
--cc=horms+renesas@verge.net.au \
--cc=jmkrzyszt@gmail.com \
--cc=keescook@chromium.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=michal.simek@xilinx.com \
--cc=peter.ujfalusi@ti.com \
--cc=radhey.shyam.pandey@xilinx.com \
--cc=shawnguo@kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox