linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: mingo@kernel.org
Cc: bp@suse.de, bhelgaas@google.com, tomi.valkeinen@ti.com,
	airlied@linux.ie, linux-fbdev@vger.kernel.org,
	luto@amacapital.net, vinod.koul@intel.com,
	dan.j.williams@intel.com, toshi.kani@hp.com,
	benh@kernel.crashing.org, mst@redhat.com,
	akpm@linux-foundation.org, daniel.vetter@ffwll.ch,
	konrad.wilk@oracle.com, x86@kernel.org,
	linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
	xen-devel@lists.xensource.com,
	"Luis R. Rodriguez" <mcgrof@suse.com>,
	dmaengine@vger.kernel.org
Subject: [PATCH v4 09/11] drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style
Date: Mon, 24 Aug 2015 19:13:31 +0000	[thread overview]
Message-ID: <1440443613-13696-10-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1440443613-13696-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>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: dmaengine@vger.kernel.org
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.4.3


  parent reply	other threads:[~2015-08-24 19:13 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-24 19:13 [PATCH v4 00/11] x86/dma: RIP MTRR and dma write-combine API rename Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 01/11] PCI: Add pci_ioremap_wc_bar() Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 02/11] drivers/video/fbdev/i740fb: Use arch_phys_wc_add() and pci_ioremap_wc_bar() Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 03/11] drivers/video/fbdev/kyrofb: " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 04/11] drivers/video/fbdev/gxt4500: Use pci_ioremap_wc_bar() to map framebuffer Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 05/11] PCI: Add pci_iomap_wc() variants Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 06/11] drivers/video/fbdev/arkfb.c: Use arch_phys_wc_add() and pci_iomap_wc() Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 07/11] drivers/video/fbdev/s3fb: " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 08/11] drivers/video/fbdev/vt8623fb: " Luis R. Rodriguez
2015-08-24 19:13 ` Luis R. Rodriguez [this message]
2015-08-24 19:13 ` [PATCH v4 10/11] dma: rename dma_*_writecombine() to dma_*_wc() Luis R. Rodriguez
2015-08-25  7:53   ` Ingo Molnar
2015-08-25 15:48     ` Luis R. Rodriguez
2015-08-25 20:43       ` Andrew Morton
2015-08-25 23:19         ` Luis R. Rodriguez
2015-08-25 23:25           ` Andrew Morton
2015-08-26  4:21             ` Ingo Molnar
2016-01-15 18:24               ` Luis R. Rodriguez
2016-01-19 11:13                 ` Ingo Molnar
2016-01-23  2:34                   ` [PATCH v5] " Luis R. Rodriguez
2015-08-25 15:53   ` [PATCH v5 10/11] " Luis R. Rodriguez
2015-08-24 19:13 ` [PATCH v4 11/11] mtrr: bury MTRR - unexport mtrr_add() and mtrr_del() 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=1440443613-13696-10-git-send-email-mcgrof@do-not-panic.com \
    --to=mcgrof@do-not-panic.com \
    --cc=airlied@linux.ie \
    --cc=akpm@linux-foundation.org \
    --cc=benh@kernel.crashing.org \
    --cc=bhelgaas@google.com \
    --cc=bp@suse.de \
    --cc=dan.j.williams@intel.com \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dmaengine@vger.kernel.org \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-fbdev@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=luto@amacapital.net \
    --cc=mcgrof@suse.com \
    --cc=mingo@kernel.org \
    --cc=mst@redhat.com \
    --cc=tomi.valkeinen@ti.com \
    --cc=toshi.kani@hp.com \
    --cc=vinod.koul@intel.com \
    --cc=x86@kernel.org \
    --cc=xen-devel@lists.xensource.com \
    /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;
as well as URLs for NNTP newsgroup(s).