[alsa-devel] [PATCH] ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list

Takashi Iwai tiwai at suse.de
Thu Mar 15 07:39:36 CET 2012


At Wed, 14 Mar 2012 19:48:43 +0000,
Mark Brown wrote:
> 
> Allows the constraint lists to be declared const by drivers which seems
> reasonable; there's plenty of other constification we could do if we were
> being complete but this was easy and quick.
> 
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

Applied to topic/misc branch.  Thanks.


Takashi


> ---
>  include/sound/pcm.h  |    5 +++--
>  sound/core/pcm_lib.c |    3 ++-
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/include/sound/pcm.h b/include/sound/pcm.h
> index 1d58d79..0d11128 100644
> --- a/include/sound/pcm.h
> +++ b/include/sound/pcm.h
> @@ -264,7 +264,7 @@ struct snd_pcm_hw_constraint_ratdens {
>  
>  struct snd_pcm_hw_constraint_list {
>  	unsigned int count;
> -	unsigned int *list;
> +	const unsigned int *list;
>  	unsigned int mask;
>  };
>  
> @@ -785,7 +785,8 @@ void snd_interval_muldivk(const struct snd_interval *a, const struct snd_interva
>  			  unsigned int k, struct snd_interval *c);
>  void snd_interval_mulkdiv(const struct snd_interval *a, unsigned int k,
>  			  const struct snd_interval *b, struct snd_interval *c);
> -int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *list, unsigned int mask);
> +int snd_interval_list(struct snd_interval *i, unsigned int count,
> +		      const unsigned int *list, unsigned int mask);
>  int snd_interval_ratnum(struct snd_interval *i,
>  			unsigned int rats_count, struct snd_ratnum *rats,
>  			unsigned int *nump, unsigned int *denp);
> diff --git a/sound/core/pcm_lib.c b/sound/core/pcm_lib.c
> index 3420bd3..4d18941 100644
> --- a/sound/core/pcm_lib.c
> +++ b/sound/core/pcm_lib.c
> @@ -1029,7 +1029,8 @@ static int snd_interval_ratden(struct snd_interval *i,
>   *
>   * Returns non-zero if the value is changed, zero if not changed.
>   */
> -int snd_interval_list(struct snd_interval *i, unsigned int count, unsigned int *list, unsigned int mask)
> +int snd_interval_list(struct snd_interval *i, unsigned int count,
> +		      const unsigned int *list, unsigned int mask)
>  {
>          unsigned int k;
>  	struct snd_interval list_range;
> -- 
> 1.7.9.1
> 


More information about the Alsa-devel mailing list