On Thu, 05 Mar 2020 06:11:41 +0100,
Samuel Holland wrote:
>
> It can be useful to derive min/max rates of a snd_pcm_hardware without
> having a snd_pcm_runtime, such as before constructing an ASoC DAI link.
>
> Create a new helper that takes a pointer to a snd_pcm_hardware directly,
> and refactor the original function as a wrapper around it, to avoid
> needing to update any call sites.
>
> Signed-off-by: Samuel Holland <samuel@xxxxxxxxxxxx>
The code change looks OK to me.
Reviewed-by: Takashi Iwai <tiwai@xxxxxxx>
thanks,
Takashi
> ---
> include/sound/pcm.h | 9 ++++++++-
> sound/core/pcm_misc.c | 18 +++++++++---------
> 2 files changed, 17 insertions(+), 10 deletions(-)
>
> diff --git a/include/sound/pcm.h b/include/sound/pcm.h
> index 2628246b76fa..f7a95b711100 100644
> --- a/include/sound/pcm.h
> +++ b/include/sound/pcm.h
> @@ -1127,7 +1127,14 @@ snd_pcm_kernel_readv(struct snd_pcm_substream *substream,
> return __snd_pcm_lib_xfer(substream, bufs, false, frames, true);
> }
>
> -int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime);
> +int snd_pcm_hw_limit_rates(struct snd_pcm_hardware *hw);
> +
> +static inline int
> +snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
> +{
> + return snd_pcm_hw_limit_rates(&runtime->hw);
> +}
> +
> unsigned int snd_pcm_rate_to_rate_bit(unsigned int rate);
> unsigned int snd_pcm_rate_bit_to_rate(unsigned int rate_bit);
> unsigned int snd_pcm_rate_mask_intersect(unsigned int rates_a,
> diff --git a/sound/core/pcm_misc.c b/sound/core/pcm_misc.c
> index a6a541511534..5dd2e5335900 100644
> --- a/sound/core/pcm_misc.c
> +++ b/sound/core/pcm_misc.c
> @@ -474,32 +474,32 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int
> EXPORT_SYMBOL(snd_pcm_format_set_silence);
>
> /**
> - * snd_pcm_limit_hw_rates - determine rate_min/rate_max fields
> - * @runtime: the runtime instance
> + * snd_pcm_hw_limit_rates - determine rate_min/rate_max fields
> + * @hw: the pcm hw instance
> *
> * Determines the rate_min and rate_max fields from the rates bits of
> - * the given runtime->hw.
> + * the given hw.
> *
> * Return: Zero if successful.
> */
> -int snd_pcm_limit_hw_rates(struct snd_pcm_runtime *runtime)
> +int snd_pcm_hw_limit_rates(struct snd_pcm_hardware *hw)
> {
> int i;
> for (i = 0; i < (int)snd_pcm_known_rates.count; i++) {
> - if (runtime->hw.rates & (1 << i)) {
> - runtime->hw.rate_min = snd_pcm_known_rates.list[i];
> + if (hw->rates & (1 << i)) {
> + hw->rate_min = snd_pcm_known_rates.list[i];
> break;
> }
> }
> for (i = (int)snd_pcm_known_rates.count - 1; i >= 0; i--) {
> - if (runtime->hw.rates & (1 << i)) {
> - runtime->hw.rate_max = snd_pcm_known_rates.list[i];
> + if (hw->rates & (1 << i)) {
> + hw->rate_max = snd_pcm_known_rates.list[i];
> break;
> }
> }
> return 0;
> }
> -EXPORT_SYMBOL(snd_pcm_limit_hw_rates);
> +EXPORT_SYMBOL(snd_pcm_hw_limit_rates);
>
> /**
> * snd_pcm_rate_to_rate_bit - converts sample rate to SNDRV_PCM_RATE_xxx bit
> --
> 2.24.1
>
