Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755605AbbHYI1b (ORCPT ); Tue, 25 Aug 2015 04:27:31 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38962 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755550AbbHYI0V (ORCPT ); Tue, 25 Aug 2015 04:26:21 -0400 Date: Tue, 25 Aug 2015 01:25:42 -0700 From: "tip-bot for Luis R. Rodriguez" Message-ID: Cc: hpa@zytor.com, vinod.koul@intel.com, mingo@kernel.org, mcgrof@suse.com, bp@suse.de, torvalds@linux-foundation.org, tglx@linutronix.de, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org Reply-To: torvalds@linux-foundation.org, tglx@linutronix.de, dan.j.williams@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, hpa@zytor.com, vinod.koul@intel.com, mingo@kernel.org, bp@suse.de, mcgrof@suse.com In-Reply-To: <1440443613-13696-10-git-send-email-mcgrof@do-not-panic.com> References: <1440443613-13696-10-git-send-email-mcgrof@do-not-panic.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style Git-Commit-ID: 39c33704420b147fb7e193a9f406cc8420a1d610 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2325 Lines: 62 Commit-ID: 39c33704420b147fb7e193a9f406cc8420a1d610 Gitweb: http://git.kernel.org/tip/39c33704420b147fb7e193a9f406cc8420a1d610 Author: Luis R. Rodriguez AuthorDate: Mon, 24 Aug 2015 12:13:31 -0700 Committer: Ingo Molnar CommitDate: Tue, 25 Aug 2015 09:59:46 +0200 drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style 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 Signed-off-by: Borislav Petkov Acked-by: Vinod Koul Cc: Dan Williams Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: airlied@linux.ie Cc: benh@kernel.crashing.org Cc: bhelgaas@google.com Cc: daniel.vetter@ffwll.ch Cc: dmaengine@vger.kernel.org Cc: konrad.wilk@oracle.com Cc: luto@amacapital.net Cc: mst@redhat.com Cc: tomi.valkeinen@ti.com Cc: toshi.kani@hp.com Cc: xen-devel@lists.xensource.com Link: http://lkml.kernel.org/r/1440443613-13696-10-git-send-email-mcgrof@do-not-panic.com Signed-off-by: Ingo Molnar --- 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 9988268..e4f4312 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/