From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: mingo@elte.hu
Cc: vinod.koul@intel.com, dan.j.williams@intel.com,
dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
benh@kernel.crashing.org, "Luis R. Rodriguez" <mcgrof@suse.com>,
x86@kernel.org, Borislav Petkov <bp@suse.de>
Subject: [PATCH v2 1/2] drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style
Date: Thu, 9 Jul 2015 18:34:23 -0700 [thread overview]
Message-ID: <1436492064-3400-2-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1436492064-3400-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@suse.com>
dma_alloc_writecombine()'s call and return value check is tangled in all
in one call. Untangle both calls according to kernel coding style.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: dmaengine@vger.kernel.org
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/1435258191-543-2-git-send-email-mcgrof@do-not-panic.com
Signed-off-by: Borislav Petkov <bp@suse.de>
---
drivers/dma/iop-adma.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c
index 998826854fdd..e4f43125e0fb 100644
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@ -1300,10 +1300,11 @@ static int iop_adma_probe(struct platform_device *pdev)
* note: writecombine gives slightly better performance, but
* requires that we explicitly flush the writes
*/
- if ((adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev,
- plat_data->pool_size,
- &adev->dma_desc_pool,
- GFP_KERNEL)) == NULL) {
+ adev->dma_desc_pool_virt = dma_alloc_writecombine(&pdev->dev,
+ plat_data->pool_size,
+ &adev->dma_desc_pool,
+ GFP_KERNEL);
+ if (!adev->dma_desc_pool_virt) {
ret = -ENOMEM;
goto err_free_adev;
}
--
2.3.2.209.gd67f9d5.dirty
next prev parent reply other threads:[~2015-07-10 1:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 1:34 [PATCH v2 0/2] dma: rename write-combine APIs with short form Luis R. Rodriguez
2015-07-10 1:34 ` Luis R. Rodriguez [this message]
2015-07-23 17:23 ` [PATCH v2 1/2] drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style Vinod Koul
2015-07-24 18:59 ` Luis R. Rodriguez
2015-07-10 1:34 ` [PATCH v2 2/2] dma: rename dma_*_writecombine() to dma_*_wc() Luis R. Rodriguez
2015-07-17 20:35 ` [PATCH v2 0/2] dma: rename write-combine APIs with short form Luis R. Rodriguez
2015-07-18 3:42 ` Ingo Molnar
2015-07-27 23:58 ` Luis R. Rodriguez
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=1436492064-3400-2-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=benh@kernel.crashing.org \
--cc=bp@suse.de \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcgrof@suse.com \
--cc=mingo@elte.hu \
--cc=vinod.koul@intel.com \
--cc=x86@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