diff options
| author | Mark Brown <broonie@kernel.org> | 2018-04-18 15:40:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-04-18 15:49:41 +0100 |
| commit | 24ada03555505205b0c8b8b796d52926600bf947 (patch) | |
| tree | f6ad7d3b85ea6ad4b0b7434aec1d96ccfea0c7ff /sound/soc/intel/skylake/skl-topology.c | |
| parent | 221dd96c30a7c65b24ead7fdd7645abb99506ce2 (diff) | |
| download | linux-24ada03555505205b0c8b8b796d52926600bf947.tar.bz2 | |
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 'sound/soc/intel/skylake/skl-topology.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 6ac081f1f215..3b1dca419883 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -2851,7 +2851,7 @@ void skl_cleanup_resources(struct skl *skl) * information to the driver about module and pipeline parameters which DSP * FW expects like ids, resource values, formats etc */ -static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, int index, +static int skl_tplg_widget_load(struct snd_soc_component *cmpnt, struct snd_soc_dapm_widget *w, struct snd_soc_tplg_dapm_widget *tplg_w) { @@ -2958,7 +2958,6 @@ static int skl_init_enum_data(struct device *dev, struct soc_enum *se, } static int skl_tplg_control_load(struct snd_soc_component *cmpnt, - int index, struct snd_kcontrol_new *kctl, struct snd_soc_tplg_ctl_hdr *hdr) { @@ -3447,7 +3446,7 @@ static int skl_tplg_get_manifest_data(struct snd_soc_tplg_manifest *manifest, return 0; } -static int skl_manifest_load(struct snd_soc_component *cmpnt, int index, +static int skl_manifest_load(struct snd_soc_component *cmpnt, struct snd_soc_tplg_manifest *manifest) { struct hdac_ext_bus *ebus = snd_soc_component_get_drvdata(cmpnt); |