From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [V2,fix] dmaengine: st_fdma: use dmaenginem_async_device_register to simplify the code From: Huang Shijie Message-Id: <20180806094328.15483-1-sjhuang@iluvatar.ai> Date: Mon, 6 Aug 2018 17:43:28 +0800 To: vkoul@kernel.org Cc: dan.j.williams@intel.com, Zubair.Kakakhel@imgtec.com, daniel@zonque.org, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, patrice.chotard@st.com, linus.walleij@linaro.org, mcoquelin.stm32@gmail.com, alexandre.torgue@st.com, Eugeniy.Paltsev@synopsys.com, colin.king@canonical.com, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Huang Shijie List-ID: VXNlIGRtYWVuZ2luZW1fYXN5bmNfZGV2aWNlX3JlZ2lzdGVyIHRvIHNpbXBsaWZ5IHRoZSBjb2Rl OgoJcmVtb3ZlIGRtYV9hc3luY19kZXZpY2VfdW5yZWdpc3Rlci4KCXJlbW92ZSBsYWJlbCBlcnJf ZG1hX2RldgoKU2lnbmVkLW9mZi1ieTogSHVhbmcgU2hpamllIDxzamh1YW5nQGlsdXZhdGFyLmFp PgotLS0KUmVtb3ZlIHRoZSBsYWJlbCBlcnJfZG1hX2RldgotLS0KIGRyaXZlcnMvZG1hL3N0X2Zk bWEuYyB8IDcgKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgNSBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9zdF9mZG1hLmMgYi9kcml2ZXJzL2Rt YS9zdF9mZG1hLmMKaW5kZXggYmZiNzliZDBjNmRlLi4wN2MyMGFhMmU5NTUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZG1hL3N0X2ZkbWEuYworKysgYi9kcml2ZXJzL2RtYS9zdF9mZG1hLmMKQEAgLTgz Myw3ICs4MzMsNyBAQCBzdGF0aWMgaW50IHN0X2ZkbWFfcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rl dmljZSAqcGRldikKIAlmZGV2LT5kbWFfZGV2aWNlLmRpcmVjdGlvbnMgPSBCSVQoRE1BX0RFVl9U T19NRU0pIHwgQklUKERNQV9NRU1fVE9fREVWKTsKIAlmZGV2LT5kbWFfZGV2aWNlLnJlc2lkdWVf Z3JhbnVsYXJpdHkgPSBETUFfUkVTSURVRV9HUkFOVUxBUklUWV9CVVJTVDsKIAotCXJldCA9IGRt YV9hc3luY19kZXZpY2VfcmVnaXN0ZXIoJmZkZXYtPmRtYV9kZXZpY2UpOworCXJldCA9IGRtYWVu Z2luZW1fYXN5bmNfZGV2aWNlX3JlZ2lzdGVyKCZmZGV2LT5kbWFfZGV2aWNlKTsKIAlpZiAocmV0 KSB7CiAJCWRldl9lcnIoJnBkZXYtPmRldiwKIAkJCSJGYWlsZWQgdG8gcmVnaXN0ZXIgRE1BIGRl dmljZSAoJWQpXG4iLCByZXQpOwpAQCAtODQ0LDE1ICs4NDQsMTMgQEAgc3RhdGljIGludCBzdF9m ZG1hX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJaWYgKHJldCkgewogCQlk ZXZfZXJyKCZwZGV2LT5kZXYsCiAJCQkiRmFpbGVkIHRvIHJlZ2lzdGVyIGNvbnRyb2xsZXIgKCVk KVxuIiwgcmV0KTsKLQkJZ290byBlcnJfZG1hX2RldjsKKwkJZ290byBlcnJfcnByb2M7CiAJfQog CiAJZGV2X2luZm8oJnBkZXYtPmRldiwgIlNUIEZETUEgZW5naW5lIGRyaXZlciwgaXJxOiVkXG4i LCBmZGV2LT5pcnEpOwogCiAJcmV0dXJuIDA7CiAKLWVycl9kbWFfZGV2OgotCWRtYV9hc3luY19k ZXZpY2VfdW5yZWdpc3RlcigmZmRldi0+ZG1hX2RldmljZSk7CiBlcnJfcnByb2M6CiAJc3RfZmRt YV9mcmVlKGZkZXYpOwogCXN0X3NsaW1fcnByb2NfcHV0KGZkZXYtPnNsaW1fcnByb2MpOwpAQCAt ODY3LDcgKzg2NSw2IEBAIHN0YXRpYyBpbnQgc3RfZmRtYV9yZW1vdmUoc3RydWN0IHBsYXRmb3Jt X2RldmljZSAqcGRldikKIAlkZXZtX2ZyZWVfaXJxKCZwZGV2LT5kZXYsIGZkZXYtPmlycSwgZmRl dik7CiAJc3Rfc2xpbV9ycHJvY19wdXQoZmRldi0+c2xpbV9ycHJvYyk7CiAJb2ZfZG1hX2NvbnRy b2xsZXJfZnJlZShwZGV2LT5kZXYub2Zfbm9kZSk7Ci0JZG1hX2FzeW5jX2RldmljZV91bnJlZ2lz dGVyKCZmZGV2LT5kbWFfZGV2aWNlKTsKIAogCXJldHVybiAwOwogfQo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: sjhuang@iluvatar.ai (Huang Shijie) Date: Mon, 6 Aug 2018 17:43:28 +0800 Subject: [PATCH V2 fix] dmaengine: st_fdma: use dmaenginem_async_device_register to simplify the code In-Reply-To: <20180806085231.4597-4-sjhuang@iluvatar.ai> References: <20180806085231.4597-4-sjhuang@iluvatar.ai> Message-ID: <20180806094328.15483-1-sjhuang@iluvatar.ai> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Use dmaenginem_async_device_register to simplify the code: remove dma_async_device_unregister. remove label err_dma_dev Signed-off-by: Huang Shijie --- Remove the label err_dma_dev --- drivers/dma/st_fdma.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/dma/st_fdma.c b/drivers/dma/st_fdma.c index bfb79bd0c6de..07c20aa2e955 100644 --- a/drivers/dma/st_fdma.c +++ b/drivers/dma/st_fdma.c @@ -833,7 +833,7 @@ static int st_fdma_probe(struct platform_device *pdev) fdev->dma_device.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); fdev->dma_device.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; - ret = dma_async_device_register(&fdev->dma_device); + ret = dmaenginem_async_device_register(&fdev->dma_device); if (ret) { dev_err(&pdev->dev, "Failed to register DMA device (%d)\n", ret); @@ -844,15 +844,13 @@ static int st_fdma_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Failed to register controller (%d)\n", ret); - goto err_dma_dev; + goto err_rproc; } dev_info(&pdev->dev, "ST FDMA engine driver, irq:%d\n", fdev->irq); return 0; -err_dma_dev: - dma_async_device_unregister(&fdev->dma_device); err_rproc: st_fdma_free(fdev); st_slim_rproc_put(fdev->slim_rproc); @@ -867,7 +865,6 @@ static int st_fdma_remove(struct platform_device *pdev) devm_free_irq(&pdev->dev, fdev->irq, fdev); st_slim_rproc_put(fdev->slim_rproc); of_dma_controller_free(pdev->dev.of_node); - dma_async_device_unregister(&fdev->dma_device); return 0; } -- 2.17.1