Message ID | db9e59951cdcf55b4903c0358ebe220e58155bc1.1383303752.git.b42378@freescale.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 038879F2D6 for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 1 Nov 2013 11:40:15 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0E4D22049C for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 1 Nov 2013 11:40:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E269020435 for <patchwork-linux-arm@patchwork.kernel.org>; Fri, 1 Nov 2013 11:40:08 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VcD3J-0000YD-UI; Fri, 01 Nov 2013 11:38:11 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VcD2g-0004v9-4P; Fri, 01 Nov 2013 11:37:30 +0000 Received: from mail-db8lp0184.outbound.messaging.microsoft.com ([213.199.154.184] helo=db8outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VcD2R-0004pK-4M for linux-arm-kernel@lists.infradead.org; Fri, 01 Nov 2013 11:37:15 +0000 Received: from mail64-db8-R.bigfish.com (10.174.8.237) by DB8EHSOBE032.bigfish.com (10.174.4.95) with Microsoft SMTP Server id 14.1.225.22; Fri, 1 Nov 2013 11:36:54 +0000 Received: from mail64-db8 (localhost [127.0.0.1]) by mail64-db8-R.bigfish.com (Postfix) with ESMTP id 122244000AD; Fri, 1 Nov 2013 11:36:54 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 6 X-BigFish: VS6(zzzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h1d1ah1d2ah1fc6h1082kz70kz1de098h8275bh1de097hz2dh2a8h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1e23h1fe8h1ff5h2218h2216h1155h) Received: from mail64-db8 (localhost.localdomain [127.0.0.1]) by mail64-db8 (MessageSwitch) id 1383305812500688_22148; Fri, 1 Nov 2013 11:36:52 +0000 (UTC) Received: from DB8EHSMHS020.bigfish.com (unknown [10.174.8.231]) by mail64-db8.bigfish.com (Postfix) with ESMTP id 721ACC0049; Fri, 1 Nov 2013 11:36:52 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS020.bigfish.com (10.174.4.30) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 1 Nov 2013 11:36:52 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.3.158.2; Fri, 1 Nov 2013 11:36:50 +0000 Received: from rio.ap.freescale.net (rio.ap.freescale.net [10.192.242.9]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id rA1Ba0uM029435; Fri, 1 Nov 2013 04:36:44 -0700 From: Nicolin Chen <b42378@freescale.com> To: <akpm@linux-foundation.org>, <joe@perches.com>, <nsekhar@ti.com>, <khilman@deeprootsystems.com>, <linux@arm.linux.org.uk>, <dan.j.williams@intel.com>, <vinod.koul@intel.com>, <m.chehab@samsung.com>, <hjk@hansjkoch.de>, <gregkh@linuxfoundation.org>, <perex@perex.cz>, <tiwai@suse.de>, <lgirdwood@gmail.com>, <broonie@kernel.org>, <rmk+kernel@arm.linux.org.uk>, <eric.y.miao@gmail.com>, <haojian.zhuang@gmail.com> Subject: [PATCH 6/8] ALSA: memalloc: use gen_pool_dma_alloc() to allocate iram buffer Date: Fri, 1 Nov 2013 19:36:04 +0800 Message-ID: <db9e59951cdcf55b4903c0358ebe220e58155bc1.1383303752.git.b42378@freescale.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <cover.1383303752.git.b42378@freescale.com> References: <cover.1383303752.git.b42378@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131101_073715_419392_7B2F3D1F X-CRM114-Status: UNSURE ( 8.27 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: davinci-linux-open-source@linux.davincidsp.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 |
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c index 9d93f02..5e1c7bc 100644 --- a/sound/core/memalloc.c +++ b/sound/core/memalloc.c @@ -184,11 +184,7 @@ static void snd_malloc_dev_iram(struct snd_dma_buffer *dmab, size_t size) /* Assign the pool into private_data field */ dmab->private_data = pool; - dmab->area = (void *)gen_pool_alloc(pool, size); - if (!dmab->area) - return; - - dmab->addr = gen_pool_virt_to_phys(pool, (unsigned long)dmab->area); + dmab->area = gen_pool_dma_alloc(pool, size, &dmab->addr); } /**
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code. Signed-off-by: Nicolin Chen <b42378@freescale.com> --- sound/core/memalloc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)