Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

12 files changed, 64 insertions, 59 deletions

diff --git a/arch/alpha/kernel/sys_alcor.c b/arch/alpha/kernel/sys_alcor.c
index 145dcde143ae..d7f0e97fe56f 100644
--- a/arch/alpha/kernel/sys_alcor.c
+++ b/arch/alpha/kernel/sys_alcor.c
@@ -254,7 +254,7 @@ alcor_init_pci(void)
          * motherboard, by looking for a 21040 TULIP in slot 6, which is
          * built into XLT and BRET/MAVERICK, but not available on ALCOR.
          */
-        dev = pci_find_device(PCI_VENDOR_ID_DEC,
+        dev = pci_get_device(PCI_VENDOR_ID_DEC,
                               PCI_DEVICE_ID_DEC_TULIP,
                               NULL);
         if (dev && dev->devfn == PCI_DEVFN(6,0)) {
@@ -262,6 +262,7 @@ alcor_init_pci(void)
                 printk(KERN_INFO "%s: Detected AS500 or XLT motherboard.\n",
                        __FUNCTION__);
         }
+        pci_dev_put(dev);
 }
 
 
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index 47df48a6ddb7..131a2d9f79d3 100644
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -105,7 +105,7 @@ sio_collect_irq_levels(void)
         struct pci_dev *dev = NULL;
 
         /* Iterate through the devices, collecting IRQ levels.  */
-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        for_each_pci_dev(dev) {
                 if ((dev->class >> 16 == PCI_BASE_CLASS_BRIDGE) &&
                     (dev->class >> 8 != PCI_CLASS_BRIDGE_PCMCIA))
                         continue;
@@ -229,8 +229,8 @@ alphabook1_init_pci(void)
          */
 
         dev = NULL;
-        while ((dev = pci_find_device(PCI_VENDOR_ID_NCR, PCI_ANY_ID, dev))) {
-                if (dev->device == PCI_DEVICE_ID_NCR_53C810
+        while ((dev = pci_get_device(PCI_VENDOR_ID_NCR, PCI_ANY_ID, dev))) {
+                if (dev->device == PCI_DEVICE_ID_NCR_53C810
                     || dev->device == PCI_DEVICE_ID_NCR_53C815
                     || dev->device == PCI_DEVICE_ID_NCR_53C820
                     || dev->device == PCI_DEVICE_ID_NCR_53C825) {
diff --git a/arch/frv/mb93090-mb00/pci-frv.c b/arch/frv/mb93090-mb00/pci-frv.c
index 83e5489cf039..0a26bf6f1cd4 100644
--- a/arch/frv/mb93090-mb00/pci-frv.c
+++ b/arch/frv/mb93090-mb00/pci-frv.c
@@ -142,9 +142,7 @@ static void __init pcibios_allocate_resources(int pass)
         u16 command;
         struct resource *r, *pr;
 
-        while (dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev),
-               dev != NULL
-               ) {
+        for_each_pci_dev(dev) {
                 pci_read_config_word(dev, PCI_COMMAND, &command);
                 for(idx = 0; idx < 6; idx++) {
                         r = &dev->resource[idx];
@@ -188,9 +186,7 @@ static void __init pcibios_assign_resources(void)
         int idx;
         struct resource *r;
 
-        while (dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev),
-               dev != NULL
-               ) {
+        for_each_pci_dev(dev) {
                 int class = dev->class >> 8;
 
                 /* Don't touch classless devices and host bridges */
diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
index 24622d89b1ca..c4a1144c98b0 100644
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
@@ -48,9 +48,7 @@ void __init pcibios_fixup_irqs(void)
         struct pci_dev *dev = NULL;
         uint8_t line, pin;
 
-        while (dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev),
-               dev != NULL
-               ) {
+        for_each_pci_dev(dev) {
                 pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
                 if (pin) {
                         dev->irq = pci_bus0_irq_routing[PCI_SLOT(dev->devfn)][pin - 1];
diff --git a/arch/i386/kernel/scx200.c b/arch/i386/kernel/scx200.c
index 9c968ae67c43..321f5fd26e75 100644
--- a/arch/i386/kernel/scx200.c
+++ b/arch/i386/kernel/scx200.c
@@ -143,7 +143,7 @@ static int __init scx200_init(void)
 {
         printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
 
-        return pci_module_init(&scx200_pci_driver);
+        return pci_register_driver(&scx200_pci_driver);
 }
 
 static void __exit scx200_cleanup(void)
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index 4c4522b43be5..b33aea845f58 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -53,7 +53,7 @@ static int __init pci_acpi_init(void)
                  * don't use pci_enable_device().
                  */
                 printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n");
-                while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
+                for_each_pci_dev(dev)
                         acpi_pci_irq_enable(dev);
         } else
                 printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\".  If it helps, post a report\n");
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index eeb1b1f2d548..65f67070db64 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -413,6 +413,13 @@ static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = {
                         DMI_MATCH(DMI_PRODUCT_VERSION, "PSM4"),
                 },
         },
+        {
+                .ident = "Toshiba A40 based laptop",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"),
+                },
+        },
         { }
 };
 
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index ee8e01697d96..e715aa930036 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -78,7 +78,7 @@ static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr)
         for (i=0; i < rt->size; i++)
                 sum += addr[i];
         if (!sum) {
-                DBG("PCI: Interrupt Routing Table found at 0x%p\n", rt);
+                DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt);
                 return rt;
         }
         return NULL;
@@ -128,7 +128,7 @@ static void __init pirq_peer_trick(void)
 #ifdef DEBUG
                 {
                         int j;
-                        DBG("%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot);
+                        DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot);
                         for(j=0; j<4; j++)
                                 DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap);
                         DBG("\n");
@@ -160,10 +160,10 @@ void eisa_set_level_irq(unsigned int irq)
                 return;
 
         eisa_irq_mask |= (1 << irq);
-        printk("PCI: setting IRQ %u as level-triggered\n", irq);
+        printk(KERN_DEBUG "PCI: setting IRQ %u as level-triggered\n", irq);
         val = inb(port);
         if (!(val & mask)) {
-                DBG(" -> edge");
+                DBG(KERN_DEBUG " -> edge");
                 outb(val | mask, port);
         }
 }
@@ -677,11 +677,11 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router,
         {
         case PCI_DEVICE_ID_AL_M1533:
         case PCI_DEVICE_ID_AL_M1563:
-                printk("PCI: Using ALI IRQ Router\n");
-                        r->name = "ALI";
-                        r->get = pirq_ali_get;
-                        r->set = pirq_ali_set;
-                        return 1;
+                printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n");
+                r->name = "ALI";
+                r->get = pirq_ali_get;
+                r->set = pirq_ali_set;
+                return 1;
         }
         return 0;
 }
@@ -749,12 +749,13 @@ static void __init pirq_find_router(struct irq_router *r)
         r->get = NULL;
         r->set = NULL;
         
-        DBG("PCI: Attempting to find IRQ router for %04x:%04x\n",
+        DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
             rt->rtr_vendor, rt->rtr_device);
 
         pirq_router_dev = pci_find_slot(rt->rtr_bus, rt->rtr_devfn);
         if (!pirq_router_dev) {
-                DBG("PCI: Interrupt router not found at %02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
+                DBG(KERN_DEBUG "PCI: Interrupt router not found at "
+                        "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn);
                 return;
         }
 
@@ -799,7 +800,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         /* Find IRQ pin */
         pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
         if (!pin) {
-                DBG(" -> no interrupt pin\n");
+                DBG(KERN_DEBUG " -> no interrupt pin\n");
                 return 0;
         }
         pin = pin - 1;
@@ -809,16 +810,16 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         if (!pirq_table)
                 return 0;
         
-        DBG("IRQ for %s[%c]", pci_name(dev), 'A' + pin);
+        DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin);
         info = pirq_get_info(dev);
         if (!info) {
-                DBG(" -> not found in routing table\n");
+                DBG(" -> not found in routing table\n" KERN_DEBUG);
                 return 0;
         }
         pirq = info->irq[pin].link;
         mask = info->irq[pin].bitmap;
         if (!pirq) {
-                DBG(" -> not routed\n");
+                DBG(" -> not routed\n" KERN_DEBUG);
                 return 0;
         }
         DBG(" -> PIRQ %02x, mask %04x, excl %04x", pirq, mask, pirq_table->exclusive_irqs);
@@ -848,7 +849,10 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         newirq = dev->irq;
         if (newirq && !((1 << newirq) & mask)) {
                 if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0;
-                else printk(KERN_WARNING "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n", newirq, pci_name(dev));
+                else printk("\n" KERN_WARNING
+                        "PCI: IRQ %i for device %s doesn't match PIRQ mask "
+                        "- try pci=usepirqmask\n" KERN_DEBUG, newirq,
+                        pci_name(dev));
         }
         if (!newirq && assign) {
                 for (i = 0; i < 16; i++) {
@@ -923,14 +927,14 @@ static void __init pcibios_fixup_irqs(void)
         struct pci_dev *dev = NULL;
         u8 pin;
 
-        DBG("PCI: IRQ fixup\n");
+        DBG(KERN_DEBUG "PCI: IRQ fixup\n");
         while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
                 /*
                  * If the BIOS has set an out of range IRQ number, just ignore it.
                  * Also keep track of which IRQ's are already in use.
                  */
                 if (dev->irq >= 16) {
-                        DBG("%s: ignoring bogus IRQ %d\n", pci_name(dev), dev->irq);
+                        DBG(KERN_DEBUG "%s: ignoring bogus IRQ %d\n", pci_name(dev), dev->irq);
                         dev->irq = 0;
                 }
                 /* If the IRQ is already assigned to a PCI device, ignore its ISA use penalty */
@@ -1039,7 +1043,7 @@ static struct dmi_system_id __initdata pciirq_dmi_table[] = {
 
 static int __init pcibios_irq_init(void)
 {
-        DBG("PCI: IRQ init\n");
+        DBG(KERN_DEBUG "PCI: IRQ init\n");
 
         if (pcibios_enable_irq || raw_pci_ops == NULL)
                 return 0;
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c
index 462a9af30eef..cc52e75e14e7 100644
--- a/arch/mips/vr41xx/common/vrc4173.c
+++ b/arch/mips/vr41xx/common/vrc4173.c
@@ -561,7 +561,7 @@ static int __devinit vrc4173_init(void)
 {
         int err;
 
-        err = pci_module_init(&vrc4173_driver);
+        err = pci_register_driver(&vrc4173_driver);
         if (err < 0)
                 return err;
 
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 50c75eec8874..704c846b2b0f 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -503,7 +503,7 @@ pcibios_allocate_resources(int pass)
         u16 command;
         struct resource *r;
 
-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        for_each_pci_dev(dev) {
                 pci_read_config_word(dev, PCI_COMMAND, &command);
                 for (idx = 0; idx < 6; idx++) {
                         r = &dev->resource[idx];
@@ -540,7 +540,7 @@ pcibios_assign_resources(void)
         int idx;
         struct resource *r;
 
-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
+        for_each_pci_dev(dev) {
                 int class = dev->class >> 8;
 
                 /* Don't touch classless devices and host bridges */
@@ -867,14 +867,15 @@ pci_device_from_OF_node(struct device_node* node, u8* bus, u8* devfn)
          */
         if (!pci_to_OF_bus_map)
                 return 0;
-        while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
-                if (pci_to_OF_bus_map[dev->bus->number] != *bus)
-                        continue;
-                if (dev->devfn != *devfn)
-                        continue;
-                *bus = dev->bus->number;
-                return 0;
-        }
+
+        for_each_pci_dev(dev)
+                if (pci_to_OF_bus_map[dev->bus->number] == *bus &&
+                                dev->devfn == *devfn) {
+                        *bus = dev->bus->number;
+                        pci_dev_put(dev);
+                        return 0;
+                }
+
         return -ENODEV;
 }
 EXPORT_SYMBOL(pci_device_from_OF_node);
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 5e8cc5ec6ab5..2959e3c4083d 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -351,10 +351,10 @@ mpc85xx_cds_fixup_via(struct pci_controller *hose)
 void __init
 mpc85xx_cds_pcibios_fixup(void)
 {
-        struct pci_dev *dev = NULL;
+        struct pci_dev *dev;
         u_char          c;
 
-        if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+        if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
                                         PCI_DEVICE_ID_VIA_82C586_1, NULL))) {
                 /*
                  * U-Boot does not set the enable bits
@@ -371,21 +371,24 @@ mpc85xx_cds_pcibios_fixup(void)
                  */
                 dev->irq = 14;
                 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+                pci_dev_put(dev);
         }
 
         /*
          * Force legacy USB interrupt routing
          */
-        if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+        if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
                                         PCI_DEVICE_ID_VIA_82C586_2, NULL))) {
                 dev->irq = 10;
                 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);
+                pci_dev_put(dev);
         }
 
-        if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+        if ((dev = pci_get_device(PCI_VENDOR_ID_VIA,
                                         PCI_DEVICE_ID_VIA_82C586_2, dev))) {
                 dev->irq = 11;
                 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);
+                pci_dev_put(dev);
         }
 }
 #endif /* CONFIG_PCI */
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c
index 6ffbeb701940..7991e919d8ab 100644
--- a/arch/sparc64/kernel/ebus.c
+++ b/arch/sparc64/kernel/ebus.c
@@ -527,18 +527,12 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)
 {
         struct pci_dev *pdev = start;
 
-        do {
-                pdev = pci_find_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev);
-                if (pdev &&
-                    (pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
-                     pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS))
+        while ((pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_ANY_ID, pdev)))
+                if (pdev->device == PCI_DEVICE_ID_SUN_EBUS ||
+                        pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS)
                         break;
-        } while (pdev != NULL);
 
-        if (pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS))
-                *is_rio_p = 1;
-        else
-                *is_rio_p = 0;
+        *is_rio_p = !!(pdev && (pdev->device == PCI_DEVICE_ID_SUN_RIO_EBUS));
 
         return pdev;
 }
@@ -637,6 +631,7 @@ void __init ebus_init(void)
                 ebus->is_rio = is_rio;
                 ++num_ebus;
         }
+        pci_dev_put(pdev); /* XXX for the case, when ebusnd is 0, is it OK? */
 
 #ifdef CONFIG_SUN_AUXIO
         auxio_probe();