summaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-04-18 15:40:41 +0100
committerMark Brown <broonie@kernel.org>2018-04-18 15:49:41 +0100
commit24ada03555505205b0c8b8b796d52926600bf947 (patch)
treef6ad7d3b85ea6ad4b0b7434aec1d96ccfea0c7ff /include/sound
parent221dd96c30a7c65b24ead7fdd7645abb99506ce2 (diff)
downloadlinux-stable-24ada03555505205b0c8b8b796d52926600bf947.tar.gz
linux-stable-24ada03555505205b0c8b8b796d52926600bf947.tar.bz2
linux-stable-24ada03555505205b0c8b8b796d52926600bf947.zip
ASoC: topology: Fix build errors
The two commits: 81e9b0a07889 ASoC: topology: Give more data to clients via callbacks 28aa6f7779f7 ASoC: topology: Add callback for DAPM route load/unload break the build so revert them. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-topology.h30
1 files changed, 9 insertions, 21 deletions
diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h
index 401ef2c45d6c..f552c3f56368 100644
--- a/include/sound/soc-topology.h
+++ b/include/sound/soc-topology.h
@@ -30,9 +30,6 @@ struct snd_soc_dapm_context;
struct snd_soc_card;
struct snd_kcontrol_new;
struct snd_soc_dai_link;
-struct snd_soc_dai_driver;
-struct snd_soc_dai;
-struct snd_soc_dapm_route;
/* object scan be loaded and unloaded in groups with identfying indexes */
#define SND_SOC_TPLG_INDEX_ALL 0 /* ID that matches all FW objects */
@@ -112,44 +109,35 @@ struct snd_soc_tplg_widget_events {
struct snd_soc_tplg_ops {
/* external kcontrol init - used for any driver specific init */
- int (*control_load)(struct snd_soc_component *, int index,
+ int (*control_load)(struct snd_soc_component *,
struct snd_kcontrol_new *, struct snd_soc_tplg_ctl_hdr *);
int (*control_unload)(struct snd_soc_component *,
struct snd_soc_dobj *);
- /* DAPM graph route element loading and unloading */
- int (*dapm_route_load)(struct snd_soc_component *, int index,
- struct snd_soc_dapm_route *route);
- int (*dapm_route_unload)(struct snd_soc_component *,
- struct snd_soc_dobj *);
-
/* external widget init - used for any driver specific init */
- int (*widget_load)(struct snd_soc_component *, int index,
+ 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 *, int index,
+ 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 *, int index,
- struct snd_soc_dai_driver *dai_drv,
- struct snd_soc_tplg_pcm *pcm, struct snd_soc_dai *dai);
-
+ int (*dai_load)(struct snd_soc_component *,
+ struct snd_soc_dai_driver *dai_drv);
int (*dai_unload)(struct snd_soc_component *,
struct snd_soc_dobj *);
/* DAI link - used for any driver specific init */
- int (*link_load)(struct snd_soc_component *, int index,
- struct snd_soc_dai_link *link,
- struct snd_soc_tplg_link_config *cfg);
+ int (*link_load)(struct snd_soc_component *,
+ struct snd_soc_dai_link *link);
int (*link_unload)(struct snd_soc_component *,
struct snd_soc_dobj *);
/* callback to handle vendor bespoke data */
- int (*vendor_load)(struct snd_soc_component *, int index,
+ int (*vendor_load)(struct snd_soc_component *,
struct snd_soc_tplg_hdr *);
int (*vendor_unload)(struct snd_soc_component *,
struct snd_soc_tplg_hdr *);
@@ -158,7 +146,7 @@ struct snd_soc_tplg_ops {
void (*complete)(struct snd_soc_component *);
/* manifest - optional to inform component of manifest */
- int (*manifest)(struct snd_soc_component *, int index,
+ int (*manifest)(struct snd_soc_component *,
struct snd_soc_tplg_manifest *);
/* vendor specific kcontrol handlers available for binding */