Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90996f43 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: core: Move snd_soc_set_runtime_hwparams() to soc-pcm.c 



snd_soc_set_runtime_hwparams() is the only PCM related function that lives in
soc-core.c. All other PCM related functions live in soc-pcm.c, so move
snd_soc_set_runtime_hwparams() over as well for a bit more consistency.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 80114129

sound/soc/soc-core.c

+0 −23
Original line number Diff line number Diff line
@@ -2219,29 +2219,6 @@ int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, 
}

EXPORT_SYMBOL_GPL(snd_soc_test_bits);



/**

 * snd_soc_set_runtime_hwparams - set the runtime hardware parameters

 * @substream: the pcm substream

 * @hw: the hardware parameters

 *

 * Sets the substream runtime hardware parameters.

 */

int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,

	const struct snd_pcm_hardware *hw)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	runtime->hw.info = hw->info;

	runtime->hw.formats = hw->formats;

	runtime->hw.period_bytes_min = hw->period_bytes_min;

	runtime->hw.period_bytes_max = hw->period_bytes_max;

	runtime->hw.periods_min = hw->periods_min;

	runtime->hw.periods_max = hw->periods_max;

	runtime->hw.buffer_bytes_max = hw->buffer_bytes_max;

	runtime->hw.fifo_size = hw->fifo_size;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_set_runtime_hwparams);



/**

 * snd_soc_cnew - create new control

 * @_template: control template

sound/soc/soc-pcm.c

+23 −0
Original line number Diff line number Diff line
@@ -33,6 +33,29 @@ 


#define DPCM_MAX_BE_USERS	8



/**

 * snd_soc_set_runtime_hwparams - set the runtime hardware parameters

 * @substream: the pcm substream

 * @hw: the hardware parameters

 *

 * Sets the substream runtime hardware parameters.

 */

int snd_soc_set_runtime_hwparams(struct snd_pcm_substream *substream,

	const struct snd_pcm_hardware *hw)

{

	struct snd_pcm_runtime *runtime = substream->runtime;

	runtime->hw.info = hw->info;

	runtime->hw.formats = hw->formats;

	runtime->hw.period_bytes_min = hw->period_bytes_min;

	runtime->hw.period_bytes_max = hw->period_bytes_max;

	runtime->hw.periods_min = hw->periods_min;

	runtime->hw.periods_max = hw->periods_max;

	runtime->hw.buffer_bytes_max = hw->buffer_bytes_max;

	runtime->hw.fifo_size = hw->fifo_size;

	return 0;

}

EXPORT_SYMBOL_GPL(snd_soc_set_runtime_hwparams);



/* DPCM stream event, send event to FE and all active BEs. */

static int dpcm_dapm_stream_event(struct snd_soc_pcm_runtime *fe, int dir,

	int event)