From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kuninori Morimoto Subject: [PATCH 2/3 v2] ASoC: sh: fsi: Add fsi_get_priv_frm_dai function Date: Thu, 20 Jan 2011 11:45:48 +0900 Message-ID: References: <20110112145302.GA14870@opensource.wolfsonmicro.com> <20110113222844.GC20418@linux-sh.org> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from relmlor1.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 748BC103A2F for ; Thu, 20 Jan 2011 03:45:51 +0100 (CET) Received: from relmlir4.idc.renesas.com ([10.200.68.154]) by relmlor1.idc.renesas.com ( SJSMS) with ESMTP id <0LFA00ND2VOC5B40@relmlor1.idc.renesas.com> for alsa-devel@alsa-project.org; Thu, 20 Jan 2011 11:45:48 +0900 (JST) Received: from relmlac4.idc.renesas.com ([10.200.69.24]) by relmlir4.idc.renesas.com ( SJSMS) with ESMTP id <0LFA006HEVOC7W30@relmlir4.idc.renesas.com> for alsa-devel@alsa-project.org; Thu, 20 Jan 2011 11:45:48 +0900 (JST) In-reply-to: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: Linux-ALSA , Liam Girdwood List-Id: alsa-devel@alsa-project.org Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood --- v1 -> v2 - based on current Mark's for-2.6.39 branch - add Acked-by from Liam sound/soc/sh/fsi.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 2b06402..1d0a16e 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -252,9 +252,8 @@ static struct snd_soc_dai *fsi_get_dai(struct snd_pcm_substream *substream) return rtd->cpu_dai; } -static struct fsi_priv *fsi_get_priv(struct snd_pcm_substream *substream) +static struct fsi_priv *fsi_get_priv_frm_dai(struct snd_soc_dai *dai) { - struct snd_soc_dai *dai = fsi_get_dai(substream); struct fsi_master *master = snd_soc_dai_get_drvdata(dai); if (dai->id == 0) @@ -263,6 +262,11 @@ static struct fsi_priv *fsi_get_priv(struct snd_pcm_substream *substream) return &master->fsib; } +static struct fsi_priv *fsi_get_priv(struct snd_pcm_substream *substream) +{ + return fsi_get_priv_frm_dai(fsi_get_dai(substream)); +} + static u32 fsi_get_info_flags(struct fsi_priv *fsi) { int is_porta = fsi_is_port_a(fsi); -- 1.7.1