From patchwork Thu Feb 11 12:17:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 61740 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp154617lbl; Thu, 11 Feb 2016 04:17:25 -0800 (PST) X-Received: by 10.66.251.68 with SMTP id zi4mr13564805pac.113.1455193045749; Thu, 11 Feb 2016 04:17:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d26si12328356pfb.137.2016.02.11.04.17.25; Thu, 11 Feb 2016 04:17:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752474AbcBKMRX (ORCPT + 30 others); Thu, 11 Feb 2016 07:17:23 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38659 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751813AbcBKMRU (ORCPT ); Thu, 11 Feb 2016 07:17:20 -0500 Received: by mail-wm0-f44.google.com with SMTP id p63so65747787wmp.1 for ; Thu, 11 Feb 2016 04:17:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OV+gCTwtcCLz7+qUy0Phf633j8lrua0mlFn+e7xMU0M=; b=EOFpCdW0y51CSSqtLwSTe4c5yEcA6262RjtTZ9Plr5Bq3TQHEcklz6HvsqW0XP04Ku LMrnhG5N6YsvOyZXdk0GB3dCIzH3jesPTpsNSm3JJm3DGA0JZo+TUboxwjUSumhGewke 63dNOj+9WNswsH3qDiMXfORmCX8HP6zRK/39g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OV+gCTwtcCLz7+qUy0Phf633j8lrua0mlFn+e7xMU0M=; b=kGl0e7KXAgQorSuJgtQJKlp0gDYgxEXKFzohD5c2IbTIwBP8wQjGr96DWbuh04Xdd4 qylsKZGMQnaTrOBy/SmDYRrWkCKoLKpOQGCCeTeo0CS06ORCGKVJhMeB0HlgqtpZBIk5 9Jl7impMnCq73ayXH9BS5wjszPJXp+QqZ7+uferrRh0RQZMI9/Ignc8i7gOPU/G87wbg uK14YXNtdfo5SyEpy2AErPbtsVy89g9nCgmyG03rMg5oCu8b4B7+c6mrteI9NWovcN+L h4yhZpdsw/pWDhfIvn9c1mQPY0379MpMBbJOre0BpohCLhxldhYUuv5+Fd4HusQUGGHu p1Cw== X-Gm-Message-State: AG10YOQEKuC8veGi3/DDJMZYcrbWLjCEwjFqdPzcF4mqjEy20L8oiIxdOmcCYBXx3p51WMAV X-Received: by 10.28.156.199 with SMTP id f190mr16800043wme.83.1455193039711; Thu, 11 Feb 2016 04:17:19 -0800 (PST) Received: from localhost.localdomain (host-92-13-246-184.as43234.net. [92.13.246.184]) by smtp.gmail.com with ESMTPSA id e14sm7761321wmi.21.2016.02.11.04.17.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 Feb 2016 04:17:19 -0800 (PST) From: Srinivas Kandagatla To: Patrick Lai , alsa-devel@alsa-project.org, Mark Brown Cc: Banajit Goswami , Liam Girdwood , Jaroslav Kysela , Takashi Iwai , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, kwestfie@codeaurora.org, Srinivas Kandagatla Subject: [PATCH v3 01/14] ASoC: qcom: use snd_dma_alloc/free* apis Date: Thu, 11 Feb 2016 12:17:17 +0000 Message-Id: <1455193037-1532-1-git-send-email-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455193007-1481-1-git-send-email-srinivas.kandagatla@linaro.org> References: <1455193007-1481-1-git-send-email-srinivas.kandagatla@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is no point in having local allocation functions when the driver can use snd_dma_alloc/free() apis. This patch replaces the local versions of the dma allocation apis with the snd_dma_alloc/free() apis. Signed-off-by: Srinivas Kandagatla Acked-by: Kenneth Westfield --- sound/soc/qcom/lpass-platform.c | 42 ++++++----------------------------------- 1 file changed, 6 insertions(+), 36 deletions(-) -- 1.9.1 diff --git a/sound/soc/qcom/lpass-platform.c b/sound/soc/qcom/lpass-platform.c index 4aeb8e1..ec2414d 100644 --- a/sound/soc/qcom/lpass-platform.c +++ b/sound/soc/qcom/lpass-platform.c @@ -439,39 +439,6 @@ static irqreturn_t lpass_platform_lpaif_irq(int irq, void *data) return IRQ_HANDLED; } -static int lpass_platform_alloc_buffer(struct snd_pcm_substream *substream, - struct snd_soc_pcm_runtime *rt) -{ - struct snd_dma_buffer *buf = &substream->dma_buffer; - size_t size = lpass_platform_pcm_hardware.buffer_bytes_max; - - buf->dev.type = SNDRV_DMA_TYPE_DEV; - buf->dev.dev = rt->platform->dev; - buf->private_data = NULL; - buf->area = dma_alloc_coherent(rt->platform->dev, size, &buf->addr, - GFP_KERNEL); - if (!buf->area) { - dev_err(rt->platform->dev, "%s: Could not allocate DMA buffer\n", - __func__); - return -ENOMEM; - } - buf->bytes = size; - - return 0; -} - -static void lpass_platform_free_buffer(struct snd_pcm_substream *substream, - struct snd_soc_pcm_runtime *rt) -{ - struct snd_dma_buffer *buf = &substream->dma_buffer; - - if (buf->area) { - dma_free_coherent(rt->dev, buf->bytes, buf->area, - buf->addr); - } - buf->area = NULL; -} - static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) { struct snd_pcm *pcm = soc_runtime->pcm; @@ -483,6 +450,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) struct lpass_variant *v = drvdata->variant; int ret; struct lpass_pcm_data *data; + size_t size = lpass_platform_pcm_hardware.buffer_bytes_max; data = devm_kzalloc(soc_runtime->dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -499,7 +467,9 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) snd_soc_pcm_set_drvdata(soc_runtime, data); - ret = lpass_platform_alloc_buffer(substream, soc_runtime); + ret = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, + soc_runtime->platform->dev, + size, &substream->dma_buffer); if (ret) return ret; @@ -514,7 +484,7 @@ static int lpass_platform_pcm_new(struct snd_soc_pcm_runtime *soc_runtime) return 0; err_buf: - lpass_platform_free_buffer(substream, soc_runtime); + snd_dma_free_pages(&substream->dma_buffer); return ret; } @@ -533,7 +503,7 @@ static void lpass_platform_pcm_free(struct snd_pcm *pcm) if (v->free_dma_channel) v->free_dma_channel(drvdata, data->rdma_ch); - lpass_platform_free_buffer(substream, soc_runtime); + snd_dma_free_pages(&substream->dma_buffer); } static struct snd_soc_platform_driver lpass_platform_driver = {