[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>
This commit is contained in:
parent
c74056d437
commit
d967a02712
1 changed files with 8 additions and 8 deletions
|
@ -435,22 +435,22 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu,
|
||||||
static void snd_ca0106_intr_enable(struct snd_ca0106 *emu, unsigned int intrenb)
|
static void snd_ca0106_intr_enable(struct snd_ca0106 *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_ca0106_intr_disable(struct snd_ca0106 *emu, unsigned int intrenb)
|
static void snd_ca0106_intr_disable(struct snd_ca0106 *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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Reference in a new issue