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

4 files changed, 32 insertions, 21 deletions

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;