evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ALSA] sound: emu10k1x.c fix shadowed variable warnings

Browse source 
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 <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Harvey Harrison 2008-02-29 11:44:57 +01:00 • committed by Takashi Iwai
parent 4677df07e5
commit f2948fc2f0
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sound/pci/emu10k1/emu10k1x.c
View file

@ -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) static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb)
{ {
unsigned long flags; unsigned long flags;
unsigned int enable; unsigned int intr_enable;
spin_lock_irqsave(&emu->emu_lock, flags); spin_lock_irqsave(&emu->emu_lock, flags);
enable = inl(emu->port + INTE) | intrenb; intr_enable = inl(emu->port + INTE) | intrenb;
outl(enable, emu->port + INTE); outl(intr_enable, emu->port + INTE);
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb) static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb)
{ {
unsigned long flags; unsigned long flags;
unsigned int enable; unsigned int intr_enable;
spin_lock_irqsave(&emu->emu_lock, flags); spin_lock_irqsave(&emu->emu_lock, flags);
enable = inl(emu->port + INTE) & ~intrenb; intr_enable = inl(emu->port + INTE) & ~intrenb;
outl(enable, emu->port + INTE); outl(intr_enable, emu->port + INTE);
spin_unlock_irqrestore(&emu->emu_lock, flags); spin_unlock_irqrestore(&emu->emu_lock, flags);
} }
@ -795,9 +795,9 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id)
// capture interrupt // capture interrupt
if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) { if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) {
struct emu10k1x_voice *pvoice = &chip->capture_voice; struct emu10k1x_voice *cap_voice = &chip->capture_voice;
if (pvoice->use) if (cap_voice->use)
snd_emu10k1x_pcm_interrupt(chip, pvoice); snd_emu10k1x_pcm_interrupt(chip, cap_voice);
else else
snd_emu10k1x_intr_disable(chip, snd_emu10k1x_intr_disable(chip,
INTE_CAP_0_LOOP | INTE_CAP_0_LOOP |