sound: ice1712.c fix shadowed variable warnings
PATCH 3/8 sound: ice1712.c fix shadowed variable warnings
In all four case, adding a private value to the iooff index,
call it priv_idx.sound/pci/ice1712/ice1712.c:1300:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here sound/pci/ice1712/ice1712.c:1312:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here sound/pci/ice1712/ice1712.c:1338:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here sound/pci/ice1712/ice1712.c:1350:6: warning: symbol 'index' shadows an earlier one sound/pci/ice1712/ice1712.c:85:12: originally declared here
Signed-off-by Harvey Harrison <[email protected]>
--- sound/pci/ice1712/ice1712.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-)
sound/pci/ice1712/ice1712.c +16 -16
@@ -1297,11 +1297,11 @@ static void snd_ice1712_update_volume(struct snd_ice1712 *ice, int index)static int snd_ice1712_pro_mixer_switch_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol); -int index =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value; +int priv_idx =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value;spin_lock_irq (&ice->reg_lock); - ucontrol->value.integer.value[0 ] = !((ice->pro_volumes[index] >>15 ) &1 ); - ucontrol->value.integer.value[1 ] = !((ice->pro_volumes[index] >>31 ) &1 ); + ucontrol->value.integer.value[0 ] = !((ice->pro_volumes[priv_idx] >>15 ) &1 ); + ucontrol->value.integer.value[1 ] = !((ice->pro_volumes[priv_idx] >>31 ) &1 );spin_unlock_irq (&ice->reg_lock);return 0 ; }
@@ -1309,16 +1309,16 @@ static int snd_ice1712_pro_mixer_switch_get(struct snd_kcontrol *kcontrol, strucstatic int snd_ice1712_pro_mixer_switch_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol); -int index =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value; +int priv_idx =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value;unsigned int nval, change; nval = (ucontrol->value.integer.value[0 ] ?0 :0x00008000 ) | (ucontrol->value.integer.value[1 ] ?0 :0x80000000 );spin_lock_irq (&ice->reg_lock); - nval |= ice->pro_volumes[index] & ~0x80008000 ; - change = nval != ice->pro_volumes[index]; - ice->pro_volumes[index] = nval; -snd_ice1712_update_volume (ice, index); + nval |= ice->pro_volumes[priv_idx] & ~0x80008000 ; + change = nval != ice->pro_volumes[priv_idx]; + ice->pro_volumes[priv_idx] = nval; +snd_ice1712_update_volume (ice, priv_idx);spin_unlock_irq (&ice->reg_lock);return change; }
@@ -1335,11 +1335,11 @@ static int snd_ice1712_pro_mixer_volume_info(struct snd_kcontrol *kcontrol, strustatic int snd_ice1712_pro_mixer_volume_get (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol); -int index =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value; +int priv_idx =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value;spin_lock_irq (&ice->reg_lock); - ucontrol->value.integer.value[0 ] = (ice->pro_volumes[index] >>0 ) &127 ; - ucontrol->value.integer.value[1 ] = (ice->pro_volumes[index] >>16 ) &127 ; + ucontrol->value.integer.value[0 ] = (ice->pro_volumes[priv_idx] >>0 ) &127 ; + ucontrol->value.integer.value[1 ] = (ice->pro_volumes[priv_idx] >>16 ) &127 ;spin_unlock_irq (&ice->reg_lock);return 0 ; }
@@ -1347,16 +1347,16 @@ static int snd_ice1712_pro_mixer_volume_get(struct snd_kcontrol *kcontrol, strucstatic int snd_ice1712_pro_mixer_volume_put (struct snd_kcontrol *kcontrol,struct snd_ctl_elem_value *ucontrol) {struct snd_ice1712 *ice =snd_kcontrol_chip (kcontrol); -int index =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value; +int priv_idx =snd_ctl_get_ioffidx (kcontrol, &ucontrol->id) + kcontrol->private_value;unsigned int nval, change; nval = (ucontrol->value.integer.value[0 ] &127 ) | ((ucontrol->value.integer.value[1 ] &127 ) <<16 );spin_lock_irq (&ice->reg_lock); - nval |= ice->pro_volumes[index] & ~0x007f007f ; - change = nval != ice->pro_volumes[index]; - ice->pro_volumes[index] = nval; -snd_ice1712_update_volume (ice, index); + nval |= ice->pro_volumes[priv_idx] & ~0x007f007f ; + change = nval != ice->pro_volumes[priv_idx]; + ice->pro_volumes[priv_idx] = nval; +snd_ice1712_update_volume (ice, priv_idx);spin_unlock_irq (&ice->reg_lock);return change; }
Signature · 1 line
1.5.4.3.342.g99e8