summaryrefslogtreecommitdiffstats
path: root/sound/soc/meson
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-10-18 21:10:09 +0100
committerMark Brown <broonie@kernel.org>2021-10-18 21:10:09 +0100
commita79b02d5f24ffb2f963971eef4ef7222a0f31ab4 (patch)
tree09274f1a3d6d27cd34aa57923ddaba8f3501f9e1 /sound/soc/meson
parenta2b5c48abd485b289d3502466a9e8e1785f5adf3 (diff)
parent7db07e37e13cfd46039d82aed91092185eac6565 (diff)
downloadlinux-a79b02d5f24ffb2f963971eef4ef7222a0f31ab4.tar.gz
linux-a79b02d5f24ffb2f963971eef4ef7222a0f31ab4.tar.bz2
linux-a79b02d5f24ffb2f963971eef4ef7222a0f31ab4.zip
Merge series "ASoC: cleanup / tidyup soc-pcm/core/component" from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:
Hi Mark These are not a big deal, but cleanup / tidyup patch for ALSA SoC. Kuninori Morimoto (5): ASoC: soc-pcm: tidyup soc_pcm_hw_clean() - step1 ASoC: soc-pcm: tidyup soc_pcm_hw_clean() - step2 ASoC: soc-component: add snd_soc_component_is_codec() ASoC: soc-core: tidyup empty function ASoC: soc-core: accept zero format at snd_soc_runtime_set_dai_fmt() include/sound/soc-component.h | 5 +++ sound/soc/generic/simple-card-utils.c | 4 +-- sound/soc/meson/meson-codec-glue.c | 3 -- sound/soc/soc-core.c | 51 ++++++++------------------- sound/soc/soc-pcm.c | 13 +++---- 5 files changed, 26 insertions(+), 50 deletions(-) -- 2.25.1
Diffstat (limited to 'sound/soc/meson')
-rw-r--r--sound/soc/meson/meson-codec-glue.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/meson/meson-codec-glue.c b/sound/soc/meson/meson-codec-glue.c
index d07270d17cee..2870cfad813a 100644
--- a/sound/soc/meson/meson-codec-glue.c
+++ b/sound/soc/meson/meson-codec-glue.c
@@ -113,9 +113,6 @@ int meson_codec_glue_output_startup(struct snd_pcm_substream *substream,
/* Replace link params with the input params */
rtd->dai_link->params = &in_data->params;
- if (!in_data->fmt)
- return 0;
-
return snd_soc_runtime_set_dai_fmt(rtd, in_data->fmt);
}
EXPORT_SYMBOL_GPL(meson_codec_glue_output_startup);