Message ID | a4cb5380b1eeb1c634cedfe05d2a7dee950742a4.1383306365.git.b42378@freescale.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <davinci-linux-open-source-bounces@linux.davincidsp.com> X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6E81BBEEB2 for <patchwork-davinci@patchwork.kernel.org>; Fri, 1 Nov 2013 11:51:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C1EE5201BF for <patchwork-davinci@patchwork.kernel.org>; Fri, 1 Nov 2013 11:51:41 +0000 (UTC) Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51DDA20181 for <patchwork-davinci@patchwork.kernel.org>; Fri, 1 Nov 2013 11:51:40 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id rA1BoXrX003627; Fri, 1 Nov 2013 06:50:33 -0500 Received: from DFLE73.ent.ti.com ([128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id rA1BoX4x013772; Fri, 1 Nov 2013 06:50:33 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.2.342.3; Fri, 1 Nov 2013 06:50:33 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id rA1BoWTo025985; Fri, 1 Nov 2013 06:50:32 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 846E38063C; Fri, 1 Nov 2013 05:50:32 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp51.itg.ti.com (dflp51.itg.ti.com [128.247.22.94]) by linux.omap.com (Postfix) with ESMTP id 6DE028062A for <davinci-linux-open-source@linux.davincidsp.com>; Fri, 1 Nov 2013 05:49:00 -0600 (CST) Received: from medina.ext.ti.com (medina.ext.ti.com [192.91.81.31]) by dflp51.itg.ti.com (8.13.7/8.13.8) with ESMTP id rA1Bmtm2005486 for <davinci-linux-open-source@linux.davincidsp.com>; Fri, 1 Nov 2013 06:49:00 -0500 (CDT) Received: from mail6.bemta7.messagelabs.com (mail6.bemta7.messagelabs.com [216.82.255.55]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id rA1BmsTS028006 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for <davinci-linux-open-source@linux.davincidsp.com>; Fri, 1 Nov 2013 06:48:54 -0500 Received: from [216.82.253.163:57725] by server-2.bemta-7.messagelabs.com id 06/31-17930-62593725; Fri, 01 Nov 2013 11:48:54 +0000 X-Env-Sender: B42378@freescale.com X-Msg-Ref: server-3.tower-166.messagelabs.com!1383306532!11202009!1 X-Originating-IP: [213.199.154.205] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 6.9.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19522 invoked from network); 1 Nov 2013 11:48:53 -0000 Received: from am1ehsobe002.messaging.microsoft.com (HELO am1outboundpool.messaging.microsoft.com) (213.199.154.205) by server-3.tower-166.messagelabs.com with AES128-SHA encrypted SMTP; 1 Nov 2013 11:48:53 -0000 Received: from mail16-am1-R.bigfish.com (10.3.201.250) by AM1EHSOBE025.bigfish.com (10.3.207.147) with Microsoft SMTP Server id 14.1.225.22; Fri, 1 Nov 2013 11:48:51 +0000 Received: from mail16-am1 (localhost [127.0.0.1]) by mail16-am1-R.bigfish.com (Postfix) with ESMTP id A6EE0401A6; Fri, 1 Nov 2013 11:48:51 +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 mail16-am1 (localhost.localdomain [127.0.0.1]) by mail16-am1 (MessageSwitch) id 1383306530264869_22585; Fri, 1 Nov 2013 11:48:50 +0000 (UTC) Received: from AM1EHSMHS008.bigfish.com (unknown [10.3.201.253]) by mail16-am1.bigfish.com (Postfix) with ESMTP id 39083440073; Fri, 1 Nov 2013 11:48:50 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by AM1EHSMHS008.bigfish.com (10.3.207.108) with Microsoft SMTP Server (TLS) id 14.16.227.3; Fri, 1 Nov 2013 11:48:50 +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:48:48 +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 rA1BmFGF005023; Fri, 1 Nov 2013 04:48:42 -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][RESEND 4/8] [media] coda: use gen_pool_dma_alloc() to allocate iram buffer Date: Fri, 1 Nov 2013 19:48:17 +0800 Message-ID: <a4cb5380b1eeb1c634cedfe05d2a7dee950742a4.1383306365.git.b42378@freescale.com> X-Mailer: git-send-email 1.8.4 In-Reply-To: <cover.1383306365.git.b42378@freescale.com> References: <cover.1383306365.git.b42378@freescale.com> MIME-Version: 1.0 X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% 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: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: <davinci-linux-open-source.linux.davincidsp.com> List-Unsubscribe: <http://linux.davincidsp.com/mailman/options/davinci-linux-open-source>, <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=unsubscribe> List-Archive: <http://linux.davincidsp.com/pipermail/davinci-linux-open-source> List-Post: <mailto:davinci-linux-open-source@linux.davincidsp.com> List-Help: <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=help> List-Subscribe: <http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source>, <mailto:davinci-linux-open-source-request@linux.davincidsp.com?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: <davinci-linux-open-source-bounces@linux.davincidsp.com> Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 |
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index ed4998c..bd72fb9 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -3298,13 +3298,12 @@ static int coda_probe(struct platform_device *pdev) dev->iram_size = CODA7_IRAM_SIZE; break; } - dev->iram_vaddr = gen_pool_alloc(dev->iram_pool, dev->iram_size); + dev->iram_vaddr = (unsigned long)gen_pool_dma_alloc(dev->iram_pool, + dev->iram_size, (dma_addr_t *)&dev->iram_paddr); if (!dev->iram_vaddr) { dev_err(&pdev->dev, "unable to alloc iram\n"); return -ENOMEM; } - dev->iram_paddr = gen_pool_virt_to_phys(dev->iram_pool, - dev->iram_vaddr); platform_set_drvdata(pdev, dev);
Since gen_pool_dma_alloc() is introduced, we implement it to simplify code. Signed-off-by: Nicolin Chen <b42378@freescale.com> --- drivers/media/platform/coda.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)