dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ASoC: dapm: Move CODEC<->CODEC params off stack 

Reduce our stack consumption by moving the params off the stack, they
are reasonably large and might be an issue on platforms with small stacks.

Reported-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Ackeded-by: Liam Girdwood <lrg@ti.com>
This commit is contained in:
Mark Brown 2012-04-26 19:12:21 +01:00
parent 3a334adab0
commit 9747cec21e
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sound/soc/soc-dapm.c
View File

@ -2989,7 +2989,7 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
struct snd_soc_dai *source, *sink; struct snd_soc_dai *source, *sink;
const struct snd_soc_pcm_stream *config = w->params; const struct snd_soc_pcm_stream *config = w->params;
struct snd_pcm_substream substream; struct snd_pcm_substream substream;
struct snd_pcm_hw_params params; struct snd_pcm_hw_params *params = NULL;
u64 fmt; u64 fmt;
int ret; int ret;
@ -3019,17 +3019,21 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
} }
/* Currently very limited parameter selection */ /* Currently very limited parameter selection */
memset(&params, 0, sizeof(params)); params = kzalloc(sizeof(*params), GFP_KERNEL);
snd_mask_set(hw_param_mask(&params, SNDRV_PCM_HW_PARAM_FORMAT), fmt); if (!params) {
ret = -ENOMEM;
goto out;
}
snd_mask_set(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), fmt);
hw_param_interval(&params, SNDRV_PCM_HW_PARAM_RATE)->min = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->min =
config->rate_min; config->rate_min;
hw_param_interval(&params, SNDRV_PCM_HW_PARAM_RATE)->max = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max =
config->rate_max; config->rate_max;
hw_param_interval(&params, SNDRV_PCM_HW_PARAM_CHANNELS)->min hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->min
= config->channels_min; = config->channels_min;
hw_param_interval(&params, SNDRV_PCM_HW_PARAM_CHANNELS)->max hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS)->max
= config->channels_max; = config->channels_max;
memset(&substream, 0, sizeof(substream)); memset(&substream, 0, sizeof(substream));
@ -3039,22 +3043,22 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
if (source->driver->ops && source->driver->ops->hw_params) { if (source->driver->ops && source->driver->ops->hw_params) {
substream.stream = SNDRV_PCM_STREAM_CAPTURE; substream.stream = SNDRV_PCM_STREAM_CAPTURE;
ret = source->driver->ops->hw_params(&substream, ret = source->driver->ops->hw_params(&substream,
&params, source); params, source);
if (ret != 0) { if (ret != 0) {
dev_err(source->dev, dev_err(source->dev,
"hw_params() failed: %d\n", ret); "hw_params() failed: %d\n", ret);
return ret; goto out;
} }
} }
if (sink->driver->ops && sink->driver->ops->hw_params) { if (sink->driver->ops && sink->driver->ops->hw_params) {
substream.stream = SNDRV_PCM_STREAM_PLAYBACK; substream.stream = SNDRV_PCM_STREAM_PLAYBACK;
ret = sink->driver->ops->hw_params(&substream, &params, ret = sink->driver->ops->hw_params(&substream, params,
sink); sink);
if (ret != 0) { if (ret != 0) {
dev_err(sink->dev, dev_err(sink->dev,
"hw_params() failed: %d\n", ret); "hw_params() failed: %d\n", ret);
return ret; goto out;
} }
} }
break; break;
@ -3063,12 +3067,14 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
ret = snd_soc_dai_digital_mute(sink, 0); ret = snd_soc_dai_digital_mute(sink, 0);
if (ret != 0 && ret != -ENOTSUPP) if (ret != 0 && ret != -ENOTSUPP)
dev_warn(sink->dev, "Failed to unmute: %d\n", ret); dev_warn(sink->dev, "Failed to unmute: %d\n", ret);
ret = 0;
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
ret = snd_soc_dai_digital_mute(sink, 1); ret = snd_soc_dai_digital_mute(sink, 1);
if (ret != 0 && ret != -ENOTSUPP) if (ret != 0 && ret != -ENOTSUPP)
dev_warn(sink->dev, "Failed to mute: %d\n", ret); dev_warn(sink->dev, "Failed to mute: %d\n", ret);
ret = 0;
break; break;
default: default:
@ -3076,7 +3082,9 @@ static int snd_soc_dai_link_event(struct snd_soc_dapm_widget *w,
return -EINVAL; return -EINVAL;
} }
return 0; out:
kfree(params);
return ret;
} }
int snd_soc_dapm_new_pcm(struct snd_soc_card *card, int snd_soc_dapm_new_pcm(struct snd_soc_card *card,