From patchwork Fri Nov 1 11:36:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 3124071 X-Patchwork-Delegate: vinod.koul@intel.com Return-Path: X-Original-To: patchwork-dmaengine@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 180AC9F2D6 for ; Fri, 1 Nov 2013 11:38:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C3CC20465 for ; Fri, 1 Nov 2013 11:38:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95E5120435 for ; Fri, 1 Nov 2013 11:38:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756107Ab3KALg5 (ORCPT ); Fri, 1 Nov 2013 07:36:57 -0400 Received: from mail-db8lp0187.outbound.messaging.microsoft.com ([213.199.154.187]:52799 "EHLO db8outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751792Ab3KALgz (ORCPT ); Fri, 1 Nov 2013 07:36:55 -0400 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 To: , , , , , , , , , , , , , , , , CC: , , , , , 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: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 Since gen_pool_dma_alloc() is introduced, we implement it to simplify code. Signed-off-by: Nicolin Chen --- sound/core/memalloc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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); } /**