Skip to contentSkip to conversation

ALSA: pcm: Make constraints lists const

PATCH Applied Mark Brown 2 participants 2 messages Jul 5, 2012 Sound

lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 ALSA: pcm: Make constraints lists const

They aren't modified by the core so the drivers can declare them const.

---
 include/sound/pcm.h  |    2 +-
 sound/core/pcm_lib.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/sound/pcm.h +1 -1
index e7afcc9..c75c0d1 100644
@@ -810,7 +810,7 @@ int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_pa
 int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, 
 			       unsigned int cond,
 			       snd_pcm_hw_param_t var,
-			       struct snd_pcm_hw_constraint_list *l);
+			       const struct snd_pcm_hw_constraint_list *l);
 int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, 
 				  unsigned int cond,
 				  snd_pcm_hw_param_t var,
sound/core/pcm_lib.c +1 -1
index 8f312fa6..8659bc5 100644
@@ -1253,7 +1253,7 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
 			       struct snd_pcm_hw_constraint_list *l)
 {
 	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_list, l,
+				   snd_pcm_hw_rule_list, (void *)l,
 				   var, -1);
 }
 
Signature · 1 line
1.7.10
Applied
#1 lore raw

At Thu, 5 Jul 2012 12:15:01 +0100,

Quoted 4 lines · Mark Brown

They aren't modified by the core so the drivers can declare them const.

Thanks, applied (with the missing const in pcm_lib.c).

Takashi

Quoted 34 lines
---
 include/sound/pcm.h  |    2 +-
 sound/core/pcm_lib.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
include/sound/pcm.h +1 -1
index e7afcc9..c75c0d1 100644
@@ -810,7 +810,7 @@ int snd_pcm_hw_constraint_integer(struct snd_pcm_runtime *runtime, snd_pcm_hw_pa
 int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime, 
 			       unsigned int cond,
 			       snd_pcm_hw_param_t var,
-			       struct snd_pcm_hw_constraint_list *l);
+			       const struct snd_pcm_hw_constraint_list *l);
 int snd_pcm_hw_constraint_ratnums(struct snd_pcm_runtime *runtime, 
 				  unsigned int cond,
 				  snd_pcm_hw_param_t var,
sound/core/pcm_lib.c +1 -1
index 8f312fa6..8659bc5 100644
@@ -1253,7 +1253,7 @@ int snd_pcm_hw_constraint_list(struct snd_pcm_runtime *runtime,
 			       struct snd_pcm_hw_constraint_list *l)
 {
 	return snd_pcm_hw_rule_add(runtime, cond, var,
-				   snd_pcm_hw_rule_list, l,
+				   snd_pcm_hw_rule_list, (void *)l,
 				   var, -1);
 }
 
Signature · 1 line
1.7.10