On 07/01/2014 09:48 AM, Benoit Cousson wrote:
Add a function helper to factorize the hw_params code.
Suggested by Lars-Peter Clausen lars@metafoo.de
Signed-off-by: Benoit Cousson bcousson@baylibre.com
include/sound/soc.h | 4 ++++ sound/soc/soc-dapm.c | 26 ++++++-------------------- sound/soc/soc-pcm.c | 41 ++++++++++++++++++++++------------------- 3 files changed, 32 insertions(+), 39 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index f2142cf..98555f8 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -436,6 +436,10 @@ int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream, int snd_soc_platform_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_platform *platform);
+int soc_dai_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params,struct snd_soc_dai *dai);- /* Jack reporting */ int snd_soc_jack_new(struct snd_soc_codec *codec, const char *id, int type, struct snd_soc_jack *jack);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 5c63c3b..d8a24bb 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3214,27 +3214,13 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
switch (event) { case SND_SOC_DAPM_PRE_PMU:
if (source->driver->ops && source->driver->ops->hw_params) {substream.stream = SNDRV_PCM_STREAM_CAPTURE;ret = source->driver->ops->hw_params(&substream,params, source);if (ret != 0) {dev_err(source->dev,"ASoC: hw_params() failed: %d\n", ret);goto out;}}
substream.stream = SNDRV_PCM_STREAM_CAPTURE;if (soc_dai_hw_params(&substream, params, source) < 0)goto out;
ret = ... if (ret < 0) goto out;
This should also fix the compiler warning about using ret uninitialized.
Same comment for the other places in this patch that do the same.
if (sink->driver->ops && sink->driver->ops->hw_params) {substream.stream = SNDRV_PCM_STREAM_PLAYBACK;ret = sink->driver->ops->hw_params(&substream, params,sink);if (ret != 0) {dev_err(sink->dev,"ASoC: hw_params() failed: %d\n", ret);goto out;}}
substream.stream = SNDRV_PCM_STREAM_PLAYBACK;if (soc_dai_hw_params(&substream, params, sink) < 0)goto out;