diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-29 05:44:57 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:18 -0400 |
commit | f2948fc2f0e1c19b8bea77a14338d338e941ac9a (patch) | |
tree | f44d4c8676bbf6cae2226814c49ac26f9c68f036 | |
parent | 4677df07e551d64167f64eba5e3563b3df7f4ca8 (diff) |
[ALSA] 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 <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/pci/emu10k1/emu10k1x.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c index 5512abd98bd9..341f34e19f3c 100644 --- a/sound/pci/emu10k1/emu10k1x.c +++ b/sound/pci/emu10k1/emu10k1x.c | |||
@@ -327,22 +327,22 @@ static void snd_emu10k1x_ptr_write(struct emu10k1x *emu, | |||
327 | static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb) | 327 | static void snd_emu10k1x_intr_enable(struct emu10k1x *emu, unsigned int intrenb) |
328 | { | 328 | { |
329 | unsigned long flags; | 329 | unsigned long flags; |
330 | unsigned int enable; | 330 | unsigned int intr_enable; |
331 | 331 | ||
332 | spin_lock_irqsave(&emu->emu_lock, flags); | 332 | spin_lock_irqsave(&emu->emu_lock, flags); |
333 | enable = inl(emu->port + INTE) | intrenb; | 333 | intr_enable = inl(emu->port + INTE) | intrenb; |
334 | outl(enable, emu->port + INTE); | 334 | outl(intr_enable, emu->port + INTE); |
335 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 335 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
336 | } | 336 | } |
337 | 337 | ||
338 | static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb) | 338 | static void snd_emu10k1x_intr_disable(struct emu10k1x *emu, unsigned int intrenb) |
339 | { | 339 | { |
340 | unsigned long flags; | 340 | unsigned long flags; |
341 | unsigned int enable; | 341 | unsigned int intr_enable; |
342 | 342 | ||
343 | spin_lock_irqsave(&emu->emu_lock, flags); | 343 | spin_lock_irqsave(&emu->emu_lock, flags); |
344 | enable = inl(emu->port + INTE) & ~intrenb; | 344 | intr_enable = inl(emu->port + INTE) & ~intrenb; |
345 | outl(enable, emu->port + INTE); | 345 | outl(intr_enable, emu->port + INTE); |
346 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 346 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
347 | } | 347 | } |
348 | 348 | ||
@@ -795,9 +795,9 @@ static irqreturn_t snd_emu10k1x_interrupt(int irq, void *dev_id) | |||
795 | 795 | ||
796 | // capture interrupt | 796 | // capture interrupt |
797 | if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) { | 797 | if (status & (IPR_CAP_0_LOOP | IPR_CAP_0_HALF_LOOP)) { |
798 | struct emu10k1x_voice *pvoice = &chip->capture_voice; | 798 | struct emu10k1x_voice *cap_voice = &chip->capture_voice; |
799 | if (pvoice->use) | 799 | if (cap_voice->use) |
800 | snd_emu10k1x_pcm_interrupt(chip, pvoice); | 800 | snd_emu10k1x_pcm_interrupt(chip, cap_voice); |
801 | else | 801 | else |
802 | snd_emu10k1x_intr_disable(chip, | 802 | snd_emu10k1x_intr_disable(chip, |
803 | INTE_CAP_0_LOOP | | 803 | INTE_CAP_0_LOOP | |