From mboxrd@z Thu Jan 1 00:00:00 1970 From: Liam Girdwood Subject: Re: [PATCH] ASoC: topology: Fix build by declaring snd_kcontrol_new and soc_dai_link. Date: Tue, 06 Jun 2017 15:49:22 +0100 Message-ID: <1496760562.31880.40.camel@loki> References: <1496760309-6195-1-git-send-email-liam.r.girdwood@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by alsa0.perex.cz (Postfix) with ESMTP id 3BBDB266EB0 for ; Tue, 6 Jun 2017 16:49:29 +0200 (CEST) In-Reply-To: <1496760309-6195-1-git-send-email-liam.r.girdwood@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Mark Brown Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org Apologies, this one has changes from a future patch. Please ignore it. On Tue, 2017-06-06 at 15:45 +0100, Liam Girdwood wrote: > Both are used within this header so need to be declared. > > Signed-off-by: Liam Girdwood > --- > include/sound/soc-topology.h | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h > index f9cc7b9271ac..7ea2794e1c6a 100644 > --- a/include/sound/soc-topology.h > +++ b/include/sound/soc-topology.h > @@ -28,6 +28,8 @@ struct snd_soc_component; > struct snd_soc_tplg_pcm_fe; > struct snd_soc_dapm_context; > struct snd_soc_card; > +struct snd_kcontrol_new; > +struct snd_soc_dai_link; > > /* object scan be loaded and unloaded in groups with identfying indexes */ > #define SND_SOC_TPLG_INDEX_ALL 0 /* ID that matches all FW objects */ > @@ -116,12 +118,16 @@ struct snd_soc_tplg_ops { > int (*widget_load)(struct snd_soc_component *, > struct snd_soc_dapm_widget *, > struct snd_soc_tplg_dapm_widget *); > + int (*widget_ready)(struct snd_soc_component *, > + struct snd_soc_dapm_widget *, > + struct snd_soc_tplg_dapm_widget *); > int (*widget_unload)(struct snd_soc_component *, > struct snd_soc_dobj *); > > /* FE DAI - used for any driver specific init */ > int (*dai_load)(struct snd_soc_component *, > - struct snd_soc_dai_driver *dai_drv); > + struct snd_soc_dai_driver *dai_drv, > + struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai); > int (*dai_unload)(struct snd_soc_component *, > struct snd_soc_dobj *); >