sound: emu10k1x.c fix shadowed variable warnings
PATCH 2/8 sound: emu10k1x.c fix shadowed variable warnings
enable in these contexts refers specifically to intr enable, as
per the two functions it is found in. Use intr_enable instead. sound/pci/emu10k1/emu10k1x.c:330:15: warning: symbol 'enable' shadows an earlier one sound/pci/emu10k1/emu10k1x.c:53:12: originally declared here sound/pci/emu10k1/emu10k1x.c:341:15: warning: symbol 'enable' shadows an earlier one sound/pci/emu10k1/emu10k1x.c:53:12: originally declared here
instead of shadowing, use cap_voice as we test for the capture
voice in this statement.sound/pci/emu10k1/emu10k1x.c:798:25: warning: symbol 'pvoice' shadows an earlier one sound/pci/emu10k1/emu10k1x.c:787:24: originally declared here
Signed-off-by Harvey Harrison <[email protected]>
--- sound/pci/emu10k1/emu10k1x.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-)
sound/pci/emu10k1/emu10k1x.c +11 -11
@@ -327,22 +327,22 @@ static void snd_emu10k1x_ptr_write(struct emu10k1x *emu,static void snd_emu10k1x_intr_enable (struct emu10k1x *emu,unsigned int intrenb) {unsigned long flags; -unsigned int enable; - +unsigned int intr_enable; +spin_lock_irqsave (&emu->emu_lock, flags); - enable =inl (emu->port +INTE ) | intrenb; -outl (enable, emu->port +INTE ); + intr_enable =inl (emu->port +INTE ) | intrenb; +outl (intr_enable, emu->port +INTE );spin_unlock_irqrestore (&emu->emu_lock, flags); }static void snd_emu10k1x_intr_disable (struct emu10k1x *emu,unsigned int intrenb) {unsigned long flags; -unsigned int enable; - +unsigned int intr_enable; +spin_lock_irqsave (&emu->emu_lock, flags); - enable =inl (emu->port +INTE ) & ~intrenb; -outl (enable, emu->port +INTE ); + intr_enable =inl (emu->port +INTE ) & ~intrenb; +outl (intr_enable, emu->port +INTE );spin_unlock_irqrestore (&emu->emu_lock, flags); }
@@ -795,9 +795,9 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id)// capture interrupt if (status & (IPR_CAP_0_LOOP |IPR_CAP_0_HALF_LOOP )) { -struct emu10k1x_voice *pvoice = &chip->capture_voice; -if (pvoice->use) -snd_emu10k1x_pcm_interrupt (chip, pvoice); +struct emu10k1x_voice *cap_voice = &chip->capture_voice; +if (cap_voice->use) +snd_emu10k1x_pcm_interrupt (chip, cap_voice);else snd_emu10k1x_intr_disable(chip, INTE_CAP_0_LOOP |
Signature · 1 line
1.5.4.3.342.g99e8