diff options
| author |   Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:55 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-26 11:15:55 +0900 |
| commit | 6439e5c2a784f6b00dd136df54d6f0859bc77af3 (patch) | |
| tree | f9dee1f0bdcf07eb7ce86dfbf9f1a558bae62404 /include/sound | |
| parent | Merge tag 'asoc-v4.3-rc2' into asoc-next (diff) | |
| parent | ASoC: compress: add config item for soc-compress to make it compiled only when needed (diff) | |
| download | linux-dev-6439e5c2a784f6b00dd136df54d6f0859bc77af3.tar.xz linux-dev-6439e5c2a784f6b00dd136df54d6f0859bc77af3.zip | |
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 2 | ||||
| -rw-r--r-- | include/sound/soc.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 2df96b1384c7..238200ffba5b 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -214,7 +214,7 @@ struct snd_soc_dai_driver { int (*suspend)(struct snd_soc_dai *dai); int (*resume)(struct snd_soc_dai *dai); /* compress dai */ - bool compress_dai; + int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num); /* DAI is also used for the control bus */ bool bus_control; diff --git a/include/sound/soc.h b/include/sound/soc.h index 824ee7b91734..904d69429087 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -452,7 +452,9 @@ int snd_soc_platform_read(struct snd_soc_platform *platform, int snd_soc_platform_write(struct snd_soc_platform *platform, unsigned int reg, unsigned int val); int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); -int soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num); +#ifdef CONFIG_SND_SOC_COMPRESS +int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num); +#endif struct snd_pcm_substream *snd_soc_get_dai_substream(struct snd_soc_card *card, const char *dai_link, int stream); @@ -605,7 +607,7 @@ int snd_soc_put_volsw_range(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); int snd_soc_get_volsw_range(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol); -int snd_soc_limit_volume(struct snd_soc_codec *codec, +int snd_soc_limit_volume(struct snd_soc_card *card, const char *name, int max); int snd_soc_bytes_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo); |