From patchwork Thu Jun 25 18:49:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Luis R. Rodriguez" X-Patchwork-Id: 6677231 Return-Path: X-Original-To: patchwork-dmaengine@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7B1ABC05AC for ; Thu, 25 Jun 2015 18:54:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A6662073E for ; Thu, 25 Jun 2015 18:54:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 962942073C for ; Thu, 25 Jun 2015 18:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751069AbbFYSyQ (ORCPT ); Thu, 25 Jun 2015 14:54:16 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:36703 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751252AbbFYSyP (ORCPT ); Thu, 25 Jun 2015 14:54:15 -0400 Received: by paceq1 with SMTP id eq1so54433687pac.3; Thu, 25 Jun 2015 11:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hRjletBmdSMnvY2mar72lqknMSxhG6I7xfH9YjjLyMY=; b=p3Q+3h2CIZAbfTKyKd6vtY3MbKOdGYgKYRxl7MofpxC01PdONim1Wcno32dqG9630a MNZAUI/0nYySDmnC66wUrP3a1rb3fHtz3x/09DgTpylPcd8TWOkIlMEhsPjSQ1rj+ecj TmYmf3J4knstZvi9b0MevxU9BG6bM7e2gtc+cKfgPaoqjiCfGB+ofNXH2fpCSmwOxSwB hflbWnEKpXcml+muf0d5/ZfMlZpleIIUVKKtDp1sytlAnL9fyxsDbKMy5IkR0F0KglI3 U/ys043Pl20trdO4aCIUj1HCt1NOvEHrMxyhAw0K+0CpWM4ZX9lYubtJRgziuMv9NQ5p EwGg== X-Received: by 10.68.203.231 with SMTP id kt7mr2618493pbc.58.1435258455048; Thu, 25 Jun 2015 11:54:15 -0700 (PDT) Received: from mcgrof@gmail.com (c-98-234-145-61.hsd1.ca.comcast.net. [98.234.145.61]) by mx.google.com with ESMTPSA id kr8sm22325793pdb.86.2015.06.25.11.54.12 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 25 Jun 2015 11:54:13 -0700 (PDT) Received: by mcgrof@gmail.com (sSMTP sendmail emulation); Thu, 25 Jun 2015 11:52:04 -0700 From: "Luis R. Rodriguez" To: bp@suse.de, mingo@elte.hu, vinod.koul@intel.com Cc: dan.j.williams@intel.com, dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 1/2] iop-adma: detangle dma_alloc_writecombine() use and check Date: Thu, 25 Jun 2015 11:49:50 -0700 Message-Id: <1435258191-543-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1435258191-543-1-git-send-email-mcgrof@do-not-panic.com> References: <1435258191-543-1-git-send-email-mcgrof@do-not-panic.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: "Luis R. Rodriguez" dma_alloc_writecombine()'s call and return value check is tangled in all in one call. Detangle both calls as we're used to. Cc: Vinod Koul Cc: Dan Williams Cc: dmaengine@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Luis R. Rodriguez --- 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; }