Update of /cvsroot/alsa/alsa-kernel/pci/ali5451
In directory usw-pr-cvs1:/tmp/cvs-serv21790/pci/ali5451
Modified Files:
ali5451.c
Log Message:
Removal of save_flags/cli/restore_flags for 2.5
Index: ali5451.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pci/ali5451/ali5451.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ali5451.c 15 Aug 2002 12:13:08 -0000 1.18
+++ ali5451.c 3 Oct 2002 10:35:18 -0000 1.19
@@ -1871,7 +1871,6 @@
ali_t *chip = snd_magic_cast(ali_t, pci_get_drvdata(dev), return);
#endif
ali_image_t *im;
- unsigned long flags;
int i, j;
im = chip->image;
@@ -1882,8 +1881,7 @@
return;
#endif
- save_flags(flags);
- cli();
+ spin_lock_irq(&chip->reg_lock);
im->regs[ALI_MISCINT >> 2] = inl(ALI_REG(chip, ALI_MISCINT));
// im->regs[ALI_START >> 2] = inl(ALI_REG(chip, ALI_START));
@@ -1907,7 +1905,7 @@
// stop all HW channel
outl(0xffffffff, ALI_REG(chip, ALI_STOP));
- restore_flags(flags);
+ spin_unlock_irq(&chip->reg_lock);
#ifndef PCI_OLD_SUSPEND
return 0;
#endif
@@ -1925,7 +1923,6 @@
ali_t *chip = snd_magic_cast(ali_t, pci_get_drvdata(dev), return);
#endif
ali_image_t *im;
- unsigned long flags;
int i, j;
im = chip->image;
@@ -1938,8 +1935,7 @@
pci_enable_device(chip->pci);
- save_flags(flags);
- cli();
+ spin_lock_irq(&chip->reg_lock);
for (i = 0; i < ALI_CHANNELS; i++) {
outb(i, ALI_REG(chip, ALI_GC_CIR));
@@ -1960,7 +1956,7 @@
// restore IRQ enable bits
outl(im->regs[ALI_MISCINT >> 2], ALI_REG(chip, ALI_MISCINT));
- restore_flags(flags);
+ spin_unlock_irq(&chip->reg_lock);
#ifndef PCI_OLD_SUSPEND
return 0;
#endif
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
