From patchwork Mon Sep 3 16:59:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liam Girdwood X-Patchwork-Id: 1416951 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D1D6740220 for ; Thu, 6 Sep 2012 16:23:44 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9eWr-00058z-J1; Thu, 06 Sep 2012 16:02:08 +0000 Received: from [2002:4e20:1eda::1] (helo=caramon.arm.linux.org.uk) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T8ZzZ-0006MT-6m for linux-arm-kernel@lists.infradead.org; Mon, 03 Sep 2012 16:59:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Subject:Cc:Cc:To:From:References:In-Reply-To; bh=1NtUtiKIndTlYcdlcagzeWj7EL3WN9CMpUkDgfQeoxM=; b=JfbyJc6Jl+n5g9KobjqlQ42JzGRBxn3BlMXu9etrPwLoIBOUsvh3XdGvYKc6yY7/HSDIXoSBx5I3jMxUOEzxYYnNPWVkxTOAYd82dwdwQQ00/gq5ifBvdWOZ5/gwCVOe7Yaqhw9o280AQZREUeOYAIWKvhqrkYMR0io4JfusXrU=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd]:38492 helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1T8ZzV-0007a8-QY; Mon, 03 Sep 2012 17:59:13 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1T8ZzV-0002vp-2j; Mon, 03 Sep 2012 17:59:13 +0100 In-Reply-To: <20120903165832.GA31511@n2100.arm.linux.org.uk> References: <20120903165832.GA31511@n2100.arm.linux.org.uk> From: Liam Girdwood To: linux-arm-kernel@lists.infradead.org,linux-omap@vger.kernel.org Subject: [RFC 1/3] ASoC: dmaengine: Don't use runtime private data for dmaengine data Message-Id: Date: Mon, 03 Sep 2012 17:59:13 +0100 X-Bad-Reply: References and In-Reply-To but no 'Re:' in Subject. X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.8 RDNS_NONE Delivered to internal network by a host with no rDNS X-Mailman-Approved-At: Thu, 06 Sep 2012 10:43:40 -0400 Cc: alsa-devel@alsa-project.org, Takashi Iwai , Mark Brown , Jaroslav Kysela , Santosh Shilimkar , Liam Girdwood X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Use a dedicated member to store dmaengine data so that drivers can use private data for their own purposes. Signed-off-by: Liam Girdwood Signed-off-by: Russell King --- include/sound/pcm.h | 2 ++ sound/soc/soc-dmaengine-pcm.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/sound/pcm.h b/include/sound/pcm.h index cdca2ab..f9e4909 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h @@ -269,6 +269,7 @@ struct snd_pcm_hw_constraint_list { }; struct snd_pcm_hwptr_log; +struct dmaengine_pcm_runtime_data; struct snd_pcm_runtime { /* -- Status -- */ @@ -345,6 +346,7 @@ struct snd_pcm_runtime { unsigned char *dma_area; /* DMA area */ dma_addr_t dma_addr; /* physical bus address (not accessible from main CPU) */ size_t dma_bytes; /* size of DMA area */ + struct dmaengine_pcm_runtime_data *dmaengine_data; struct snd_dma_buffer *dma_buffer_p; /* allocated buffer */ diff --git a/sound/soc/soc-dmaengine-pcm.c b/sound/soc/soc-dmaengine-pcm.c index 5df529e..27fa5ad 100644 --- a/sound/soc/soc-dmaengine-pcm.c +++ b/sound/soc/soc-dmaengine-pcm.c @@ -40,7 +40,7 @@ struct dmaengine_pcm_runtime_data { static inline struct dmaengine_pcm_runtime_data *substream_to_prtd( const struct snd_pcm_substream *substream) { - return substream->runtime->private_data; + return substream->runtime->dmaengine_data; } /**