diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-02-28 06:02:22 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:17 -0400 |
commit | d967a02712f09265b3c357f35f125715f5dffd2f (patch) | |
tree | c39b401f7308b79d69c3963582ca1f799fbe57ce /sound/pci/ca0106 | |
parent | c74056d437401dc7d43970cd845c34a7e28723c0 (diff) |
[ALSA] sound: ca0106_main.c fix shadowed variable warnings
change to intr_enable as per the two functions it is defined in.
sound/pci/ca0106/ca0106_main.c:438:15: warning: symbol 'enable' shadows an earlier one
sound/pci/ca0106/ca0106_main.c:159:12: originally declared here
sound/pci/ca0106/ca0106_main.c:449:15: warning: symbol 'enable' shadows an earlier one
sound/pci/ca0106/ca0106_main.c:159:12: originally declared here
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ca0106')
-rw-r--r-- | sound/pci/ca0106/ca0106_main.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c index 176e0f0e8058..3818249fcc81 100644 --- a/sound/pci/ca0106/ca0106_main.c +++ b/sound/pci/ca0106/ca0106_main.c | |||
@@ -435,22 +435,22 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, | |||
435 | static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb) | 435 | static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb) |
436 | { | 436 | { |
437 | unsigned long flags; | 437 | unsigned long flags; |
438 | unsigned int enable; | 438 | unsigned int intr_enable; |
439 | 439 | ||
440 | spin_lock_irqsave(&emu->emu_lock, flags); | 440 | spin_lock_irqsave(&emu->emu_lock, flags); |
441 | enable = inl(emu->port + INTE) | intrenb; | 441 | intr_enable = inl(emu->port + INTE) | intrenb; |
442 | outl(enable, emu->port + INTE); | 442 | outl(intr_enable, emu->port + INTE); |
443 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 443 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
444 | } | 444 | } |
445 | 445 | ||
446 | static void snd_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb) | 446 | static void snd_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb) |
447 | { | 447 | { |
448 | unsigned long flags; | 448 | unsigned long flags; |
449 | unsigned int enable; | 449 | unsigned int intr_enable; |
450 | 450 | ||
451 | spin_lock_irqsave(&emu->emu_lock, flags); | 451 | spin_lock_irqsave(&emu->emu_lock, flags); |
452 | enable = inl(emu->port + INTE) & ~intrenb; | 452 | intr_enable = inl(emu->port + INTE) & ~intrenb; |
453 | outl(enable, emu->port + INTE); | 453 | outl(intr_enable, emu->port + INTE); |
454 | spin_unlock_irqrestore(&emu->emu_lock, flags); | 454 | spin_unlock_irqrestore(&emu->emu_lock, flags); |
455 | } | 455 | } |
456 | 456 | ||