aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-03-22 09:12:01 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-26 10:14:23 -0400
commitcb20d5757bbe79d9c9e4210e232934792be2336e (patch)
tree9b4507edf9daaae3713fa0a33b0008e38659734e
parentabe99370b3c583cd0fc4185e7a776b7bb48311c3 (diff)
ASoC: ux500_pcm: Remove duplicated SNDRV_PCM_HW_PARAM_PERIODS constraint
The generic dmaengine based PCM driver code takes care of setting this constraint, there is no need of doing it manually in the ux500 driver. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Acked-by: Ola Lilja <ola.o.lilja@stericsson.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/ux500/ux500_pcm.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index 846fa82a58d0..375ca6ba3ebb 100644
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -111,15 +111,6 @@ static int ux500_pcm_open(struct snd_pcm_substream *substream)
111 snd_soc_set_runtime_hwparams(substream, 111 snd_soc_set_runtime_hwparams(substream,
112 &ux500_pcm_hw_capture); 112 &ux500_pcm_hw_capture);
113 113
114 /* ensure that buffer size is a multiple of period size */
115 ret = snd_pcm_hw_constraint_integer(runtime,
116 SNDRV_PCM_HW_PARAM_PERIODS);
117 if (ret < 0) {
118 dev_err(dev, "%s: Error: snd_pcm_hw_constraints failed (%d)\n",
119 __func__, ret);
120 return ret;
121 }
122
123 dev_dbg(dev, "%s: Set hw-struct for %s.\n", __func__, 114 dev_dbg(dev, "%s: Set hw-struct for %s.\n", __func__,
124 snd_pcm_stream_str(substream)); 115 snd_pcm_stream_str(substream));
125 runtime->hw = (stream_id == SNDRV_PCM_STREAM_PLAYBACK) ? 116 runtime->hw = (stream_id == SNDRV_PCM_STREAM_PLAYBACK) ?