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: 1400591 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 9A2ECDF2AB for ; Mon, 3 Sep 2012 16:59:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932260Ab2ICQ7U (ORCPT ); Mon, 3 Sep 2012 12:59:20 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:50986 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756495Ab2ICQ7T (ORCPT ); Mon, 3 Sep 2012 12:59:19 -0400 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 Cc: Santosh Shilimkar Cc: Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , alsa-devel@alsa-project.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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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; } /**