[alsa-cvslog] CVS: alsa-driver/pci/au88x0 au88x0.c,1.2,1.3 au88x0.h,1.2,1.3 au88x0_core.c,1.2,1.3

[Takashi Iwai]

Update of /cvsroot/alsa/alsa-driver/pci/au88x0
In directory sc8-pr-cvs1:/tmp/cvs-serv12600/pci/au88x0

Modified Files:
        au88x0.c au88x0.h au88x0_core.c 
Log Message:
- reverted to use pci_request/release_regions().


Index: au88x0.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- au88x0.c    17 Nov 2003 18:27:28 -0000      1.2
+++ au88x0.c    20 Nov 2003 10:48:03 -0000      1.3
@@ -73,9 +73,7 @@
     // Take down PCI interface.
     synchronize_irq(vortex->irq);
     free_irq(vortex->irq, vortex);
-    iounmap((void*)vortex->mmio);
-    release_resource(vortex->mmio_res);
-    kfree_nocheck(vortex->mmio_res);
+    pci_release_regions(vortex->pci_dev);
     pci_disable_device(vortex->pci_dev);
     snd_magic_kfree(vortex);
 
@@ -116,16 +114,15 @@
     chip->device = pci->device;
     chip->card = card;
     chip->irq = -1;
+    spin_lock_init(&chip->lock);
 
     // (1) PCI resource allocation
     // Get MMIO area
     //
-    chip->mmio_res = request_mem_region(pci_resource_start(pci, 0), 
pci_resource_len(pci, 0), CARD_NAME_SHORT);
-    if (! chip->mmio_res) {
-       err = -EBUSY;
+    if ((err = pci_request_regions(pci, CARD_NAME_SHORT)) != 0) 
         goto regions_out;
-    }
-    chip->mmio = (unsigned long) ioremap_nocache(pci_resource_start(pci,0), 
pci_resource_len(pci,0));
+       
+    chip->mmio = ioremap_nocache(pci_resource_start(pci,0), pci_resource_len(pci,0));
     if (!chip->mmio) {
         printk(KERN_ERR "MMIO area remap failed.\n");
         err = -ENOMEM;

Index: au88x0.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- au88x0.h    17 Nov 2003 18:27:28 -0000      1.2
+++ au88x0.h    20 Nov 2003 10:48:03 -0000      1.3
@@ -141,10 +141,9 @@
 
        /* PCI hardware resources */
        unsigned long io;
-       unsigned long mmio;
-       struct resource *mmio_res;
+       unsigned long *mmio;
        unsigned int irq;
-       spinlock_t lock;
+    spinlock_t lock;
 
        /* PCI device */
        struct pci_dev * pci_dev;

Index: au88x0_core.c
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/pci/au88x0/au88x0_core.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- au88x0_core.c       11 Oct 2003 08:15:25 -0000      1.2
+++ au88x0_core.c       20 Nov 2003 10:48:03 -0000      1.3
@@ -2234,7 +2234,6 @@
     //vortex_disable_timer_int(vortex);
 
     printk(KERN_INFO "done.\n");
-    spin_lock_init(&vortex->lock);
 
     return 0;
 }



-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive?  Does it
help you create better code?  SHARE THE LOVE, and help us help
YOU!  Click Here: http://sourceforge.net/donate/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog