Skip to content

Commit

Permalink
ASoC: omap-pcm: No need to set constraint at open time
Browse files Browse the repository at this point in the history
The same constraint is going to be set in the snd_dmaengine_pcm_open()
function, so there is no need to set it here as well.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Peter Ujfalusi authored and Mark Brown committed Feb 5, 2013
1 parent a88fedf commit a92b531
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions sound/soc/omap/omap-pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,23 +174,15 @@ static snd_pcm_uframes_t omap_pcm_pointer(struct snd_pcm_substream *substream)

static int omap_pcm_open(struct snd_pcm_substream *substream)
{
struct snd_pcm_runtime *runtime = substream->runtime;
struct snd_soc_pcm_runtime *rtd = substream->private_data;
struct omap_pcm_dma_data *dma_data;
int ret;

snd_soc_set_runtime_hwparams(substream, &omap_pcm_hardware);

/* Ensure that buffer size is a multiple of period size */
ret = snd_pcm_hw_constraint_integer(runtime,
SNDRV_PCM_HW_PARAM_PERIODS);
if (ret < 0)
return ret;

dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
ret = snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,
&dma_data->dma_req);
return ret;

return snd_dmaengine_pcm_open(substream, omap_dma_filter_fn,
&dma_data->dma_req);
}

static int omap_pcm_close(struct snd_pcm_substream *substream)
Expand Down

0 comments on commit a92b531

Please sign in to comment.