diff -ur linux-2.5.74/Documentation/pci.txt linux-2.5.74-zee-pci_name/Documentation/pci.txt --- linux-2.5.74/Documentation/pci.txt 2003-07-02 16:47:01.000000000 -0400 +++ linux-2.5.74-zee-pci_name/Documentation/pci.txt 2003-07-03 15:06:32.000000000 -0400 @@ -236,7 +236,7 @@ 7. Miscellaneous hints ~~~~~~~~~~~~~~~~~~~~~~ When displaying PCI slot names to the user (for example when a driver wants -to tell the user what card has it found), please use pci_dev->slot_name +to tell the user what card has it found), please use pci_name(pci_dev) for this purpose. Always refer to the PCI devices by a pointer to the pci_dev structure. diff -ur linux-2.5.74/arch/alpha/kernel/pci.c linux-2.5.74-zee-pci_name/arch/alpha/kernel/pci.c --- linux-2.5.74/arch/alpha/kernel/pci.c 2003-07-02 16:40:59.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/alpha/kernel/pci.c 2003-07-03 15:41:51.000000000 -0400 @@ -335,7 +335,7 @@ if (cmd != oldcmd) { printk(KERN_DEBUG "PCI: Enabling device: (%s), cmd %x\n", - dev->slot_name, cmd); + pci_name(dev), cmd); /* Enable the appropriate bits in the PCI command register. */ pci_write_config_word(dev, PCI_COMMAND, cmd); } @@ -354,7 +354,7 @@ pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); if (lat >= 16) return; printk("PCI: Setting latency timer of device %s to 64\n", - dev->slot_name); + pci_name(dev)); pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64); } diff -ur linux-2.5.74/arch/arm/common/sa1111-pcipool.c linux-2.5.74-zee-pci_name/arch/arm/common/sa1111-pcipool.c --- linux-2.5.74/arch/arm/common/sa1111-pcipool.c 2003-07-02 16:50:56.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/arm/common/sa1111-pcipool.c 2003-07-03 15:47:53.000000000 -0400 @@ -59,7 +59,7 @@ else if (pcidev_is_sa1111(pdev)) return "[SA-1111]"; else - return pdev->slot_name; + return pci_name(pdev); } @@ -333,7 +333,7 @@ if ((page = pool_find_page (pool, dma)) == 0) { printk (KERN_ERR "pci_pool_free %s/%s, %p/%lx (bad dma)\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, vaddr, (unsigned long) dma); return; } @@ -346,13 +346,13 @@ #ifdef CONFIG_DEBUG_SLAB if (((dma - page->dma) + (void *)page->vaddr) != vaddr) { printk (KERN_ERR "pci_pool_free %s/%s, %p (bad vaddr)/%lx\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, vaddr, (unsigned long) dma); return; } if (page->bitmap [map] & (1UL << block)) { printk (KERN_ERR "pci_pool_free %s/%s, dma %x already free\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, dma); return; } diff -ur linux-2.5.74/arch/arm/kernel/bios32.c linux-2.5.74-zee-pci_name/arch/arm/kernel/bios32.c --- linux-2.5.74/arch/arm/kernel/bios32.c 2003-07-02 16:46:08.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/arm/kernel/bios32.c 2003-07-03 15:45:37.000000000 -0400 @@ -460,7 +460,7 @@ if (debug_pci) printk("PCI: %s swizzling pin %d => pin %d slot %d\n", - dev->slot_name, oldpin, *pin, slot); + pci_name(dev), oldpin, *pin, slot); return slot; } @@ -478,7 +478,7 @@ if (debug_pci) printk("PCI: %s mapping slot %d pin %d => irq %d\n", - dev->slot_name, slot, pin, irq); + pci_name(dev), slot, pin, irq); return irq; } @@ -611,7 +611,7 @@ r = dev->resource + idx; if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because" - " of resource collisions\n", dev->slot_name); + " of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -628,7 +628,7 @@ if (cmd != old_cmd) { printk("PCI: enabling device %s (%04x -> %04x)\n", - dev->slot_name, old_cmd, cmd); + pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; diff -ur linux-2.5.74/arch/arm/mach-footbridge/netwinder-pci.c linux-2.5.74-zee-pci_name/arch/arm/mach-footbridge/netwinder-pci.c --- linux-2.5.74/arch/arm/mach-footbridge/netwinder-pci.c 2003-07-02 16:40:09.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/arm/mach-footbridge/netwinder-pci.c 2003-07-03 15:48:30.000000000 -0400 @@ -37,7 +37,7 @@ default: printk(KERN_ERR "PCI: unknown device in slot %s: %s\n", - dev->slot_name, dev->dev.name); + pci_name(dev), dev->dev.name); return 0; } } diff -ur linux-2.5.74/arch/i386/pci/fixup.c linux-2.5.74-zee-pci_name/arch/i386/pci/fixup.c --- linux-2.5.74/arch/i386/pci/fixup.c 2003-07-02 16:51:04.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/i386/pci/fixup.c 2003-07-03 15:21:42.000000000 -0400 @@ -15,7 +15,7 @@ int pxb, reg; u8 busno, suba, subb; - printk(KERN_WARNING "PCI: Searching for i450NX host bridges on %s\n", d->slot_name); + printk(KERN_WARNING "PCI: Searching for i450NX host bridges on %s\n", pci_name(d)); reg = 0xd0; for(pxb=0; pxb<2; pxb++) { pci_read_config_byte(d, reg++, &busno); @@ -38,7 +38,7 @@ */ u8 busno; pci_read_config_byte(d, 0x4a, &busno); - printk(KERN_INFO "PCI: i440KX/GX host bridge %s: secondary bus %02x\n", d->slot_name, busno); + printk(KERN_INFO "PCI: i440KX/GX host bridge %s: secondary bus %02x\n", pci_name(d), busno); pci_scan_bus(busno, &pci_root_ops, NULL); pcibios_last_bus = -1; } @@ -51,7 +51,7 @@ */ int i; - printk(KERN_WARNING "PCI: Fixing base address flags for device %s\n", d->slot_name); + printk(KERN_WARNING "PCI: Fixing base address flags for device %s\n", pci_name(d)); for(i=0; i<4; i++) d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; } @@ -63,7 +63,7 @@ * Fix class to be PCI_CLASS_STORAGE_SCSI */ if (!d->class) { - printk(KERN_WARNING "PCI: fixing NCR 53C810 class code for %s\n", d->slot_name); + printk(KERN_WARNING "PCI: fixing NCR 53C810 class code for %s\n", pci_name(d)); d->class = PCI_CLASS_STORAGE_SCSI << 8; } } @@ -77,7 +77,7 @@ */ if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) return; - DBG("PCI: IDE base address fixup for %s\n", d->slot_name); + DBG("PCI: IDE base address fixup for %s\n", pci_name(d)); for(i=0; i<4; i++) { struct resource *r = &d->resource[i]; if ((r->start & ~0x80) == 0x374) { @@ -95,7 +95,7 @@ * There exist PCI IDE controllers which have utter garbage * in first four base registers. Ignore that. */ - DBG("PCI: IDE base address trash cleared for %s\n", d->slot_name); + DBG("PCI: IDE base address trash cleared for %s\n", pci_name(d)); for(i=0; i<4; i++) d->resource[i].start = d->resource[i].end = d->resource[i].flags = 0; } diff -ur linux-2.5.74/arch/i386/pci/i386.c linux-2.5.74-zee-pci_name/arch/i386/pci/i386.c --- linux-2.5.74/arch/i386/pci/i386.c 2003-07-02 16:43:41.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/i386/pci/i386.c 2003-07-03 15:20:02.000000000 -0400 @@ -112,7 +112,7 @@ continue; pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) - printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, dev->slot_name); + printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev)); } } pcibios_allocate_bus_resources(&bus->children); @@ -143,7 +143,7 @@ r->start, r->end, r->flags, disabled, pass); pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) { - printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, dev->slot_name); + printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, pci_name(dev)); /* We'll assign a new address later */ r->end -= r->start; r->start = 0; @@ -155,7 +155,7 @@ if (r->flags & PCI_ROM_ADDRESS_ENABLE) { /* Turn the ROM off, leave the resource region, but keep it unregistered. */ u32 reg; - DBG("PCI: Switching off ROM of %s\n", dev->slot_name); + DBG("PCI: Switching off ROM of %s\n", pci_name(dev)); r->flags &= ~PCI_ROM_ADDRESS_ENABLE; pci_read_config_dword(dev, dev->rom_base_reg, ®); pci_write_config_dword(dev, dev->rom_base_reg, reg & ~PCI_ROM_ADDRESS_ENABLE); @@ -230,7 +230,7 @@ r = &dev->resource[idx]; if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); + printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -241,7 +241,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); + printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; @@ -263,7 +263,7 @@ lat = pcibios_max_latency; else return; - printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", dev->slot_name, lat); + printk(KERN_DEBUG "PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat); pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); } diff -ur linux-2.5.74/arch/i386/pci/irq.c linux-2.5.74-zee-pci_name/arch/i386/pci/irq.c --- linux-2.5.74/arch/i386/pci/irq.c 2003-07-02 16:57:43.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/i386/pci/irq.c 2003-07-03 15:25:50.000000000 -0400 @@ -545,7 +545,7 @@ pirq_router->name, pirq_router_dev->vendor, pirq_router_dev->device, - pirq_router_dev->slot_name); + pci_name(pirq_router_dev)); } static struct irq_info *pirq_get_info(struct pci_dev *dev) @@ -589,7 +589,7 @@ if (!pirq_table) return 0; - DBG("IRQ for %s:%d", dev->slot_name, pin); + DBG("IRQ for %s:%d", pci_name(dev), pin); info = pirq_get_info(dev); if (!info) { DBG(" -> not found in routing table\n"); @@ -620,7 +620,7 @@ newirq = dev->irq; if (!((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, dev->slot_name); + else printk(KERN_WARNING "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n", newirq, pci_name(dev)); } if (!newirq && assign) { for (i = 0; i < 16; i++) { @@ -662,7 +662,7 @@ } else return 0; } - printk(KERN_INFO "PCI: %s IRQ %d for device %s\n", msg, irq, dev->slot_name); + printk(KERN_INFO "PCI: %s IRQ %d for device %s\n", msg, irq, pci_name(dev)); /* Update IRQ for all devices with the same pirq value */ while ((dev2 = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev2)) != NULL) { @@ -679,13 +679,13 @@ (!(pci_probe & PCI_USE_PIRQ_MASK) || \ ((1 << dev2->irq) & mask)) ) { printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n", - dev2->slot_name, dev2->irq, irq); + pci_name(dev2), dev2->irq, irq); continue; } dev2->irq = irq; pirq_penalty[irq]++; if (dev != dev2) - printk(KERN_INFO "PCI: Sharing IRQ %d with %s\n", irq, dev2->slot_name); + printk(KERN_INFO "PCI: Sharing IRQ %d with %s\n", irq, pci_name(dev2)); } } return 1; @@ -703,7 +703,7 @@ * Also keep track of which IRQ's are already in use. */ if (dev->irq >= 16) { - DBG("%s: ignoring bogus IRQ %d\n", dev->slot_name, dev->irq); + DBG("%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 */ @@ -822,7 +822,7 @@ return 0; printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n", - 'A' + pin - 1, dev->slot_name, msg); + 'A' + pin - 1, pci_name(dev), msg); } /* VIA bridges use interrupt line for apic/pci steering across the V-Link */ diff -ur linux-2.5.74/arch/i386/pci/numa.c linux-2.5.74-zee-pci_name/arch/i386/pci/numa.c --- linux-2.5.74/arch/i386/pci/numa.c 2003-07-02 16:42:45.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/i386/pci/numa.c 2003-07-03 15:17:51.000000000 -0400 @@ -86,7 +86,7 @@ u8 busno, suba, subb; int quad = BUS2QUAD(d->bus->number); - printk("PCI: Searching for i450NX host bridges on %s\n", d->slot_name); + printk("PCI: Searching for i450NX host bridges on %s\n", pci_name(d)); reg = 0xd0; for(pxb=0; pxb<2; pxb++) { pci_read_config_byte(d, reg++, &busno); diff -ur linux-2.5.74/arch/ia64/pci/pci.c linux-2.5.74-zee-pci_name/arch/ia64/pci/pci.c --- linux-2.5.74/arch/ia64/pci/pci.c 2003-07-02 16:46:51.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/ia64/pci/pci.c 2003-07-03 15:41:08.000000000 -0400 @@ -393,7 +393,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", - dev->slot_name); + pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -404,7 +404,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); + printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; @@ -419,7 +419,7 @@ if (ret < 0) return ret; - printk(KERN_INFO "PCI: Found IRQ %d for device %s\n", dev->irq, dev->slot_name); + printk(KERN_INFO "PCI: Found IRQ %d for device %s\n", dev->irq, pci_name(dev)); return acpi_pci_irq_enable(dev); } @@ -534,7 +534,7 @@ current_linesize = 4 * pci_linesize; if (desired_linesize != current_linesize) { printk(KERN_WARNING "PCI: slot %s has incorrect PCI cache line size of %lu bytes,", - dev->slot_name, current_linesize); + pci_name(dev), current_linesize); if (current_linesize > desired_linesize) { printk(" expected %lu bytes instead\n", desired_linesize); rc = -EINVAL; diff -ur linux-2.5.74/arch/ia64/sn/io/machvec/pci.c linux-2.5.74-zee-pci_name/arch/ia64/sn/io/machvec/pci.c --- linux-2.5.74/arch/ia64/sn/io/machvec/pci.c 2003-07-02 16:43:55.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/ia64/sn/io/machvec/pci.c 2003-07-03 15:38:54.000000000 -0400 @@ -104,7 +104,7 @@ * currently we hack this with special code in * sgi_pci_intr_support() */ - DBG("pci_fixup_ioc3: Fixing base addresses for ioc3 device %s\n", d->slot_name); + DBG("pci_fixup_ioc3: Fixing base addresses for ioc3 device %s\n", pci_name(d)); /* I happen to know from the spec that the ioc3 needs only 0xfffff * The standard pci trick of writing ~0 to the baddr and seeing diff -ur linux-2.5.74/arch/mips/gt64120/common/pci.c linux-2.5.74-zee-pci_name/arch/mips/gt64120/common/pci.c --- linux-2.5.74/arch/mips/gt64120/common/pci.c 2003-07-02 16:47:33.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/gt64120/common/pci.c 2003-07-03 15:15:11.000000000 -0400 @@ -747,7 +747,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of " - "resource collisions\n", dev->slot_name); + "resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -798,7 +798,7 @@ addresses kilobyte aligned. */ if (size > 0x100) { printk(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", dev->slot_name, + " (%ld bytes)\n", pci_name(dev), dev->resource - res, size); } diff -ur linux-2.5.74/arch/mips/ite-boards/generic/it8172_pci.c linux-2.5.74-zee-pci_name/arch/mips/ite-boards/generic/it8172_pci.c --- linux-2.5.74/arch/mips/ite-boards/generic/it8172_pci.c 2003-07-02 16:51:18.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/ite-boards/generic/it8172_pci.c 2003-07-03 15:17:02.000000000 -0400 @@ -163,7 +163,7 @@ for(idx=0; idx<6; idx++) { r = &dev->resource[idx]; if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); + printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -174,7 +174,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); + printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; diff -ur linux-2.5.74/arch/mips/pci/common.c linux-2.5.74-zee-pci_name/arch/mips/pci/common.c --- linux-2.5.74/arch/mips/pci/common.c 2003-07-02 16:49:11.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/common.c 2003-07-03 15:11:35.000000000 -0400 @@ -20,7 +20,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", - dev->slot_name); + pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -32,7 +32,7 @@ cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { printk("PCI: Enabling device %s (%04x -> %04x)\n", - dev->slot_name, old_cmd, cmd); + pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; diff -ur linux-2.5.74/arch/mips/pci/ops-ev64120.c linux-2.5.74-zee-pci_name/arch/mips/pci/ops-ev64120.c --- linux-2.5.74/arch/mips/pci/ops-ev64120.c 2003-07-02 16:42:11.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/ops-ev64120.c 2003-07-03 15:09:16.000000000 -0400 @@ -804,7 +804,7 @@ galileo_pcibios_read_config_word(dev, PCI_COMMAND, &cmd); cmd |= PCI_COMMAND_MASTER; galileo_pcibios_write_config_word(dev, PCI_COMMAND, cmd); - DBG("PCI: Enabling device %s (%04x)\n", dev->slot_name, cmd); + DBG("PCI: Enabling device %s (%04x)\n", pci_name(dev), cmd); } /* Externally-expected functions. Do not change function names */ @@ -829,7 +829,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", - dev->slot_name); + pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -839,7 +839,7 @@ } if (cmd != old_cmd) { DBG(KERN_INFO "PCI: Enabling device %s (%04x -> %04x)\n", - dev->slot_name, old_cmd, cmd); + pci_name(dev), old_cmd, cmd); galileo_pcibios_write_config_word(dev, PCI_COMMAND, cmd); } @@ -884,7 +884,7 @@ addresses kilobyte aligned. */ if (size > 0x100) { DBG(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", dev->slot_name, + " (%ld bytes)\n", pci_name(dev), dev->resource - res, size); } diff -ur linux-2.5.74/arch/mips/pci/ops-ocelot.c linux-2.5.74-zee-pci_name/arch/mips/pci/ops-ocelot.c --- linux-2.5.74/arch/mips/pci/ops-ocelot.c 2003-07-02 16:54:33.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/ops-ocelot.c 2003-07-03 15:13:06.000000000 -0400 @@ -757,7 +757,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of " - "resource collisions\n", dev->slot_name); + "resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -814,7 +814,7 @@ addresses kilobyte aligned. */ if (size > 0x100) { printk(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", dev->slot_name, + " (%ld bytes)\n", pci_name(dev), dev->resource - res, size); } diff -ur linux-2.5.74/arch/mips/pci/pci-cobalt.c linux-2.5.74-zee-pci_name/arch/mips/pci/pci-cobalt.c --- linux-2.5.74/arch/mips/pci/pci-cobalt.c 2003-07-02 16:55:57.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/pci-cobalt.c 2003-07-03 15:13:35.000000000 -0400 @@ -408,7 +408,7 @@ pci_read_config_word(dev, PCI_COMMAND, &cmd); pci_read_config_word(dev, PCI_STATUS, &status); - printk("PCI: Enabling device %s (%04x %04x)\n", dev->slot_name, + printk("PCI: Enabling device %s (%04x %04x)\n", pci_name(dev), cmd, status); /* We'll sort this out when we know it isn't enabled ;) */ diff -ur linux-2.5.74/arch/mips/pci/pci-ip27.c linux-2.5.74-zee-pci_name/arch/mips/pci/pci-ip27.c --- linux-2.5.74/arch/mips/pci/pci-ip27.c 2003-07-02 16:57:34.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/pci-ip27.c 2003-07-03 15:14:27.000000000 -0400 @@ -267,7 +267,7 @@ unsigned long bus_id = (unsigned) d->bus->number; printk("PCI: Fixing base addresses for IOC3 device %s\n", - d->slot_name); + pci_name(d)); d->resource[0].start |= NODE_OFFSET(bus_to_nid[bus_id]); d->resource[0].end |= NODE_OFFSET(bus_to_nid[bus_id]); @@ -281,7 +281,7 @@ d->resource[0].start |= ((unsigned long) (bus_to_nid[d->bus->number]) << 32); - printk("PCI: Fixing isp1020 in [bus:slot.fn] %s\n", d->slot_name); + printk("PCI: Fixing isp1020 in [bus:slot.fn] %s\n", pci_name(d)); /* * Configure device to allow bus mastering, i/o and memory mapping. @@ -311,7 +311,7 @@ unsigned int start; unsigned short command; - printk("PCI: Fixing isp2x00 in [bus:slot.fn] %s\n", d->slot_name); + printk("PCI: Fixing isp2x00 in [bus:slot.fn] %s\n", pci_name(d)); /* set the resource struct for this device */ start = (u32) (u64) bridge; /* yes, we want to lose the upper 32 bits here */ diff -ur linux-2.5.74/arch/mips/pci/pci-ocelot-c.c linux-2.5.74-zee-pci_name/arch/mips/pci/pci-ocelot-c.c --- linux-2.5.74/arch/mips/pci/pci-ocelot-c.c 2003-07-02 16:51:06.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/pci-ocelot-c.c 2003-07-03 15:12:22.000000000 -0400 @@ -348,7 +348,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of " - "resource collisions\n", dev->slot_name); + "resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -402,7 +402,7 @@ addresses kilobyte aligned. */ if (size > 0x100) { printk(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", dev->slot_name, + " (%ld bytes)\n", pci_name(dev), dev->resource - res, size); } diff -ur linux-2.5.74/arch/mips/pci/pci-ocelot-g.c linux-2.5.74-zee-pci_name/arch/mips/pci/pci-ocelot-g.c --- linux-2.5.74/arch/mips/pci/pci-ocelot-g.c 2003-07-02 16:47:32.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/mips/pci/pci-ocelot-g.c 2003-07-03 15:10:48.000000000 -0400 @@ -370,7 +370,7 @@ if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because of " - "resource collisions\n", dev->slot_name); + "resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -424,7 +424,7 @@ addresses kilobyte aligned. */ if (size > 0x100) { printk(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", dev->slot_name, + " (%ld bytes)\n", pci_name(dev), dev->resource - res, size); } diff -ur linux-2.5.74/arch/parisc/kernel/pci.c linux-2.5.74-zee-pci_name/arch/parisc/kernel/pci.c --- linux-2.5.74/arch/parisc/kernel/pci.c 2003-07-02 16:39:25.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/parisc/kernel/pci.c 2003-07-03 15:49:40.000000000 -0400 @@ -327,7 +327,7 @@ unsigned long mask, align; DBG_RES("pcibios_align_resource(%s, (%p) [%lx,%lx]/%x, 0x%lx, 0x%lx)\n", - ((struct pci_dev *) data)->slot_name, + pci_name(((struct pci_dev *) data)), res->parent, res->start, res->end, (int) res->flags, size, alignment); @@ -396,7 +396,7 @@ if (dev->bus->bridge_ctl & PCI_BRIDGE_CTL_FAST_BACK) cmd |= PCI_COMMAND_FAST_BACK; #endif - DBGC("PCIBIOS: Enabling device %s cmd 0x%04x\n", dev->slot_name, cmd); + DBGC("PCIBIOS: Enabling device %s cmd 0x%04x\n", pci_name(dev), cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); return 0; } diff -ur linux-2.5.74/arch/ppc/kernel/pci.c linux-2.5.74-zee-pci_name/arch/ppc/kernel/pci.c --- linux-2.5.74/arch/ppc/kernel/pci.c 2003-07-02 16:46:58.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/ppc/kernel/pci.c 2003-07-03 15:35:38.000000000 -0400 @@ -117,7 +117,7 @@ unsigned long offset; if (!hose) { - printk(KERN_ERR "No hose for PCI dev %s!\n", dev->slot_name); + printk(KERN_ERR "No hose for PCI dev %s!\n", pci_name(dev)); return; } for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { @@ -126,7 +126,7 @@ continue; if (!res->start || res->end == 0xffffffff) { DBG("PCI:%s Resource %d [%08lx-%08lx] is unassigned\n", - dev->slot_name, i, res->start, res->end); + pci_name(dev), i, res->start, res->end); res->end -= res->start; res->start = 0; res->flags |= IORESOURCE_UNSET; @@ -144,7 +144,7 @@ res->end += offset; #ifdef DEBUG printk("Fixup res %d (%lx) of dev %s: %lx -> %lx\n", - i, res->flags, dev->slot_name, + i, res->flags, pci_name(dev), res->start - offset, res->start); #endif } @@ -231,7 +231,7 @@ if (size > 0x100) { printk(KERN_ERR "PCI: I/O Region %s/%d too large" - " (%ld bytes)\n", dev->slot_name, + " (%ld bytes)\n", pci_name(dev), dev->resource - res, size); } @@ -522,7 +522,7 @@ } else { DBG(KERN_ERR "PCI: ugh, bridge %s res %d has flags=%lx\n", - dev->slot_name, i, res->flags); + pci_name(dev), i, res->flags); } pci_write_config_word(dev, PCI_COMMAND, cmd); } @@ -532,11 +532,11 @@ struct resource *pr, *r = &dev->resource[idx]; DBG("PCI:%s: Resource %d: %08lx-%08lx (f=%lx)\n", - dev->slot_name, idx, r->start, r->end, r->flags); + pci_name(dev), idx, r->start, r->end, r->flags); pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) { printk(KERN_ERR "PCI: Cannot allocate resource region %d" - " of device %s\n", idx, dev->slot_name); + " of device %s\n", idx, pci_name(dev)); if (pr) DBG("PCI: parent is %p: %08lx-%08lx (f=%lx)\n", pr, pr->start, pr->end, pr->flags); @@ -576,7 +576,7 @@ if (r->flags & PCI_ROM_ADDRESS_ENABLE) { /* Turn the ROM off, leave the resource region, but keep it unregistered. */ u32 reg; - DBG("PCI: Switching off ROM of %s\n", dev->slot_name); + DBG("PCI: Switching off ROM of %s\n", pci_name(dev)); r->flags &= ~PCI_ROM_ADDRESS_ENABLE; pci_read_config_dword(dev, dev->rom_base_reg, ®); pci_write_config_dword(dev, dev->rom_base_reg, @@ -643,7 +643,7 @@ r = &dev->resource[idx]; if (r->flags & IORESOURCE_UNSET) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); + printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -654,7 +654,7 @@ if (dev->resource[PCI_ROM_RESOURCE].start) cmd |= PCI_COMMAND_MEMORY; if (cmd != old_cmd) { - printk("PCI: Enabling device %s (%04x -> %04x)\n", dev->slot_name, old_cmd, cmd); + printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; @@ -1409,7 +1409,7 @@ for (idx=0; idx<6; idx++) { r = &dev->resource[idx]; if (r->flags & IORESOURCE_UNSET) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); + printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -1419,7 +1419,7 @@ } if (cmd != old_cmd) { printk("PCI: Enabling device %s (%04x -> %04x)\n", - dev->slot_name, old_cmd, cmd); + pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; diff -ur linux-2.5.74/arch/ppc64/kernel/eeh.c linux-2.5.74-zee-pci_name/arch/ppc64/kernel/eeh.c --- linux-2.5.74/arch/ppc64/kernel/eeh.c 2003-07-02 16:50:21.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/ppc64/kernel/eeh.c 2003-07-03 15:42:24.000000000 -0400 @@ -116,7 +116,7 @@ dn->eeh_config_addr, BUID_HI(dn->phb->buid), BUID_LO(dn->phb->buid)); if (ret == 0 && rets[1] == 1 && rets[0] >= 2) { panic("EEH: MMIO failure (%ld) on device:\n %s %s\n", - rets[0], dev->slot_name, dev->dev.name); + rets[0], pci_name(dev), dev->dev.name); } } eeh_false_positives++; diff -ur linux-2.5.74/arch/ppc64/kernel/pSeries_pci.c linux-2.5.74-zee-pci_name/arch/ppc64/kernel/pSeries_pci.c --- linux-2.5.74/arch/ppc64/kernel/pSeries_pci.c 2003-07-02 16:58:26.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/ppc64/kernel/pSeries_pci.c 2003-07-03 15:44:36.000000000 -0400 @@ -149,18 +149,18 @@ pci_read_config_byte(pci_dev, PCI_INTERRUPT_PIN, &intpin); if (intpin == 0) { - PPCDBG(PPCDBG_BUSWALK,"\tDevice: %s No Interrupt used by device.\n", pci_dev->slot_name); + PPCDBG(PPCDBG_BUSWALK,"\tDevice: %s No Interrupt used by device.\n", pci_name(pci_dev)); return 0; } node = pci_device_to_OF_node(pci_dev); if (node == NULL) { PPCDBG(PPCDBG_BUSWALK,"\tDevice: %s Device Node not found.\n", - pci_dev->slot_name); + pci_name(pci_dev)); return -1; } if (node->n_intrs == 0) { - PPCDBG(PPCDBG_BUSWALK,"\tDevice: %s No Device OF interrupts defined.\n", pci_dev->slot_name); + PPCDBG(PPCDBG_BUSWALK,"\tDevice: %s No Device OF interrupts defined.\n", pci_name(pci_dev)); return -1; } pci_dev->irq = node->intrs[0].line; @@ -173,7 +173,7 @@ pci_write_config_byte(pci_dev, PCI_INTERRUPT_LINE, pci_dev->irq); PPCDBG(PPCDBG_BUSWALK,"\tDevice: %s pci_dev->irq = 0x%02X\n", - pci_dev->slot_name, pci_dev->irq); + pci_name(pci_dev), pci_dev->irq); return 0; } diff -ur linux-2.5.74/arch/ppc64/kernel/pci.c linux-2.5.74-zee-pci_name/arch/ppc64/kernel/pci.c --- linux-2.5.74/arch/ppc64/kernel/pci.c 2003-07-02 16:54:34.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/ppc64/kernel/pci.c 2003-07-03 15:43:31.000000000 -0400 @@ -325,7 +325,7 @@ /* Cache the location of the ISA bridge (if we have one) */ ppc64_isabridge_dev = pci_find_class(PCI_CLASS_BRIDGE_ISA << 8, NULL); if (ppc64_isabridge_dev != NULL) - printk("ISA bridge at %s\n", ppc64_isabridge_dev->slot_name); + printk("ISA bridge at %s\n", pci_name(ppc64_isabridge_dev)); printk("PCI: Probing PCI hardware done\n"); //ppc64_boot_msg(0x41, "PCI Done"); @@ -363,7 +363,7 @@ if (cmd != oldcmd) { printk(KERN_DEBUG "PCI: Enabling device: (%s), cmd %x\n", - dev->slot_name, cmd); + pci_name(dev), cmd); /* Enable the appropriate bits in the PCI command register. */ pci_write_config_word(dev, PCI_COMMAND, cmd); } diff -ur linux-2.5.74/arch/sh/boards/mpc1211/pci.c linux-2.5.74-zee-pci_name/arch/sh/boards/mpc1211/pci.c --- linux-2.5.74/arch/sh/boards/mpc1211/pci.c 2003-07-02 16:54:30.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/sh/boards/mpc1211/pci.c 2003-07-03 15:26:54.000000000 -0400 @@ -264,11 +264,11 @@ } if( irq < 0 ) { - PCIDBG(3, "PCI: Error mapping IRQ on device %s\n", dev->slot_name); + PCIDBG(3, "PCI: Error mapping IRQ on device %s\n", pci_name(dev)); return irq; } - PCIDBG(2, "Setting IRQ for slot %s to %d\n", dev->slot_name, irq); + PCIDBG(2, "Setting IRQ for slot %s to %d\n", pci_name(dev), irq); return irq; } diff -ur linux-2.5.74/arch/sh/boards/overdrive/galileo.c linux-2.5.74-zee-pci_name/arch/sh/boards/overdrive/galileo.c --- linux-2.5.74/arch/sh/boards/overdrive/galileo.c 2003-07-02 16:43:46.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/sh/boards/overdrive/galileo.c 2003-07-03 15:28:09.000000000 -0400 @@ -446,7 +446,7 @@ */ if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) return; - printk("PCI: IDE base address fixup for %s\n", d->slot_name); + printk("PCI: IDE base address fixup for %s\n", pci_name(d)); for(i=0; i<4; i++) { struct resource *r = &d->resource[i]; if ((r->start & ~0x80) == 0x374) { @@ -518,7 +518,7 @@ printk(KERN_ERR "PCI: Device %s not available because" " of resource collisions\n", - dev->slot_name); + pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -528,7 +528,7 @@ } if (cmd != old_cmd) { printk("PCI: enabling device %s (%04x -> %04x)\n", - dev->slot_name, old_cmd, cmd); + pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; @@ -589,6 +589,6 @@ lat = pcibios_max_latency; else return; - printk("PCI: Setting latency timer of device %s to %d\n", dev->slot_name, lat); + printk("PCI: Setting latency timer of device %s to %d\n", pci_name(dev), lat); pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); } diff -ur linux-2.5.74/arch/sh/kernel/cpu/sh4/pci-sh7751.c linux-2.5.74-zee-pci_name/arch/sh/kernel/cpu/sh4/pci-sh7751.c --- linux-2.5.74/arch/sh/kernel/cpu/sh4/pci-sh7751.c 2003-07-02 16:53:02.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/sh/kernel/cpu/sh4/pci-sh7751.c 2003-07-03 15:30:34.000000000 -0400 @@ -226,7 +226,7 @@ */ if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) return; - PCIDBG(3,"PCI: IDE base address fixup for %s\n", d->slot_name); + PCIDBG(3,"PCI: IDE base address fixup for %s\n", pci_name(d)); for(i=0; i<4; i++) { struct resource *r = &d->resource[i]; if ((r->start & ~0x80) == 0x374) { @@ -370,7 +370,7 @@ continue; pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) - printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, dev->slot_name); + printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev)); } } pcibios_allocate_bus_resources(&bus->children); @@ -402,7 +402,7 @@ r->start, r->end, r->flags, disabled, pass); pr = pci_find_parent_resource(dev, r); if (!pr || request_resource(pr, r) < 0) { - printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, dev->slot_name); + printk(KERN_ERR "PCI: Cannot allocate resource region %d of device %s\n", idx, pci_name(dev)); /* We'll assign a new address later */ r->end -= r->start; r->start = 0; @@ -414,7 +414,7 @@ if (r->flags & PCI_ROM_ADDRESS_ENABLE) { /* Turn the ROM off, leave the resource region, but keep it unregistered. */ u32 reg; - PCIDBG(3,"PCI: Switching off ROM of %s\n", dev->slot_name); + PCIDBG(3,"PCI: Switching off ROM of %s\n", pci_name(dev)); r->flags &= ~PCI_ROM_ADDRESS_ENABLE; pci_read_config_dword(dev, dev->rom_base_reg, ®); pci_write_config_dword(dev, dev->rom_base_reg, reg & ~PCI_ROM_ADDRESS_ENABLE); @@ -497,7 +497,7 @@ return irq; } - PCIDBG(2,"Setting IRQ for slot %s to %d\n", dev->slot_name, irq); + PCIDBG(2,"Setting IRQ for slot %s to %d\n", pci_name(dev), irq); return irq; } diff -ur linux-2.5.74/arch/sh/kernel/cpu/sh4/pci-st40.c linux-2.5.74-zee-pci_name/arch/sh/kernel/cpu/sh4/pci-st40.c --- linux-2.5.74/arch/sh/kernel/cpu/sh4/pci-st40.c 2003-07-02 16:49:26.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/sh/kernel/cpu/sh4/pci-st40.c 2003-07-03 15:28:46.000000000 -0400 @@ -151,7 +151,7 @@ */ if ((d->class >> 8) != PCI_CLASS_STORAGE_IDE) return; - printk("PCI: IDE base address fixup for %s\n", d->slot_name); + printk("PCI: IDE base address fixup for %s\n", pci_name(d)); for(i=0; i<4; i++) { struct resource *r = &d->resource[i]; if ((r->start & ~0x80) == 0x374) { diff -ur linux-2.5.74/arch/sh/kernel/pci.c linux-2.5.74-zee-pci_name/arch/sh/kernel/pci.c --- linux-2.5.74/arch/sh/kernel/pci.c 2003-07-02 16:53:36.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/sh/kernel/pci.c 2003-07-03 15:32:15.000000000 -0400 @@ -71,7 +71,7 @@ pci_read_config_dword(dev, reg, &check); if ((new ^ check) & ((new & PCI_BASE_ADDRESS_SPACE_IO) ? PCI_BASE_ADDRESS_IO_MASK : PCI_BASE_ADDRESS_MEM_MASK)) { printk(KERN_ERR "PCI: Error while updating region " - "%s/%d (%08x != %08x)\n", dev->slot_name, resource, + "%s/%d (%08x != %08x)\n", pci_name(dev), resource, new, check); } } @@ -110,7 +110,7 @@ for(idx=0; idx<6; idx++) { r = &dev->resource[idx]; if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); + printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) diff -ur linux-2.5.74/arch/sh/kernel/pcibios.c linux-2.5.74-zee-pci_name/arch/sh/kernel/pcibios.c --- linux-2.5.74/arch/sh/kernel/pcibios.c 2003-07-02 16:44:29.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/sh/kernel/pcibios.c 2003-07-03 15:31:13.000000000 -0400 @@ -54,7 +54,7 @@ for(idx=0; idx<6; idx++) { r = &dev->resource[idx]; if (!r->start && r->end) { - printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", dev->slot_name); + printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) diff -ur linux-2.5.74/arch/v850/kernel/rte_mb_a_pci.c linux-2.5.74-zee-pci_name/arch/v850/kernel/rte_mb_a_pci.c --- linux-2.5.74/arch/v850/kernel/rte_mb_a_pci.c 2003-07-02 16:43:44.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/v850/kernel/rte_mb_a_pci.c 2003-07-03 15:51:56.000000000 -0400 @@ -231,7 +231,7 @@ r = &dev->resource[idx]; if (!r->start && r->end) { printk(KERN_ERR "PCI: Device %s not available because " - "of resource collisions\n", dev->slot_name); + "of resource collisions\n", pci_name(dev)); return -EINVAL; } if (r->flags & IORESOURCE_IO) @@ -241,7 +241,7 @@ } if (cmd != old_cmd) { printk("PCI: Enabling device %s (%04x -> %04x)\n", - dev->slot_name, old_cmd, cmd); + pci_name(dev), old_cmd, cmd); pci_write_config_word(dev, PCI_COMMAND, cmd); } return 0; diff -ur linux-2.5.74/arch/x86_64/kernel/pci-gart.c linux-2.5.74-zee-pci_name/arch/x86_64/kernel/pci-gart.c --- linux-2.5.74/arch/x86_64/kernel/pci-gart.c 2003-07-02 16:46:46.000000000 -0400 +++ linux-2.5.74-zee-pci_name/arch/x86_64/kernel/pci-gart.c 2003-07-03 15:50:12.000000000 -0400 @@ -262,7 +262,7 @@ printk(KERN_ERR "PCI-DMA: Out of IOMMU space for %p size %lu at device %s[%s]\n", - addr,size, dev ? dev->dev.name : "?", dev ? dev->slot_name : "?"); + addr,size, dev ? dev->dev.name : "?", dev ? pci_name(dev) : "?"); if (size > PAGE_SIZE*EMERGENCY_PAGES) { if (dir == PCI_DMA_FROMDEVICE || dir == PCI_DMA_BIDIRECTIONAL) diff -ur linux-2.5.74/drivers/acpi/pci_irq.c linux-2.5.74-zee-pci_name/drivers/acpi/pci_irq.c --- linux-2.5.74/drivers/acpi/pci_irq.c 2003-07-02 16:46:52.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/acpi/pci_irq.c 2003-07-03 19:16:14.000000000 -0400 @@ -291,7 +291,7 @@ } if (!irq) { - ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Unable to derive IRQ for device %s\n", dev->slot_name)); + ACPI_DEBUG_PRINT((ACPI_DB_WARN, "Unable to derive IRQ for device %s\n", pci_name(dev))); return_VALUE(0); } @@ -316,7 +316,7 @@ pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin); if (!pin) { - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No interrupt pin configured for device %s\n", dev->slot_name)); + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No interrupt pin configured for device %s\n", pci_name(dev))); return_VALUE(0); } pin--; @@ -344,7 +344,7 @@ * driver reported one, then use it. Exit in any case. */ if (!irq) { - printk(KERN_WARNING PREFIX "No IRQ known for interrupt pin %c of device %s", ('A' + pin), dev->slot_name); + printk(KERN_WARNING PREFIX "No IRQ known for interrupt pin %c of device %s", ('A' + pin), pci_name(dev)); /* Interrupt Line values above 0xF are forbidden */ if (dev->irq && dev->irq >= 0xF) { printk(" - using IRQ %d\n", dev->irq); @@ -358,7 +358,7 @@ dev->irq = irq; - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device %s using IRQ %d\n", dev->slot_name, dev->irq)); + ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device %s using IRQ %d\n", pci_name(dev), dev->irq)); /* * Make sure all (legacy) PCI IRQs are set as level-triggered. diff -ur linux-2.5.74/drivers/char/agp/generic.c linux-2.5.74-zee-pci_name/drivers/char/agp/generic.c --- linux-2.5.74/drivers/char/agp/generic.c 2003-07-02 16:45:17.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/char/agp/generic.c 2003-07-03 18:12:23.000000000 -0400 @@ -515,7 +515,7 @@ continue; printk(KERN_INFO PFX "Putting AGP V%d device at %s into %dx mode\n", - agp_v3 ? 3 : 2, device->slot_name, mode); + agp_v3 ? 3 : 2, pci_name(device), mode); pci_write_config_dword(device, agp + PCI_AGP_COMMAND, command); } } diff -ur linux-2.5.74/drivers/char/agp/hp-agp.c linux-2.5.74-zee-pci_name/drivers/char/agp/hp-agp.c --- linux-2.5.74/drivers/char/agp/hp-agp.c 2003-07-02 16:53:37.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/char/agp/hp-agp.c 2003-07-03 18:12:47.000000000 -0400 @@ -363,7 +363,7 @@ return -ENODEV; printk(KERN_INFO PFX "Detected HP ZX1 AGP chipset at %s\n", - pdev->slot_name); + pci_name(pdev)); error = hp_zx1_ioc_init(); if (error) diff -ur linux-2.5.74/drivers/char/rocket.c linux-2.5.74-zee-pci_name/drivers/char/rocket.c --- linux-2.5.74/drivers/char/rocket.c 2003-07-02 16:51:04.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/char/rocket.c 2003-07-03 18:14:07.000000000 -0400 @@ -2202,7 +2202,7 @@ ctlp->AiopNumChan[aiop] = ports_per_aiop; printk("Comtrol PCI controller #%d ID 0x%x found in bus:slot:fn %s at address %04lx, " - "%d AIOP(s) (%s)\n", i, dev->device, dev->slot_name, + "%d AIOP(s) (%s)\n", i, dev->device, pci_name(dev), rcktpt_io_addr[i], num_aiops, rocketModel[i].modelString); printk(KERN_INFO "Installing %s, creating /dev/ttyR%d - %ld\n", rocketModel[i].modelString, diff -ur linux-2.5.74/drivers/eisa/pci_eisa.c linux-2.5.74-zee-pci_name/drivers/eisa/pci_eisa.c --- linux-2.5.74/drivers/eisa/pci_eisa.c 2003-07-02 16:42:04.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/eisa/pci_eisa.c 2003-07-03 18:10:59.000000000 -0400 @@ -26,7 +26,7 @@ if ((rc = pci_enable_device (pdev))) { printk (KERN_ERR "pci_eisa : Could not enable device %s\n", - pdev->slot_name); + pci_name(pdev)); return rc; } diff -ur linux-2.5.74/drivers/ide/pci/amd74xx.c linux-2.5.74-zee-pci_name/drivers/ide/pci/amd74xx.c --- linux-2.5.74/drivers/ide/pci/amd74xx.c 2003-07-02 16:58:08.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/ide/pci/amd74xx.c 2003-07-03 19:27:09.000000000 -0400 @@ -365,7 +365,7 @@ pci_read_config_byte(dev, PCI_REVISION_ID, &t); printk(KERN_INFO "AMD_IDE: %s (rev %02x) %s controller on pci%s\n", - dev->dev.name, t, amd_dma[amd_config->flags & AMD_UDMA], dev->slot_name); + dev->dev.name, t, amd_dma[amd_config->flags & AMD_UDMA], pci_name(dev)); /* * Register /proc/ide/amd74xx entry diff -ur linux-2.5.74/drivers/ide/pci/via82cxxx.c linux-2.5.74-zee-pci_name/drivers/ide/pci/via82cxxx.c --- linux-2.5.74/drivers/ide/pci/via82cxxx.c 2003-07-02 16:39:23.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/ide/pci/via82cxxx.c 2003-07-03 19:26:41.000000000 -0400 @@ -561,7 +561,7 @@ "controller on pci%s\n", via_config->name, t, via_dma[via_config->flags & VIA_UDMA], - dev->slot_name); + pci_name(dev)); /* * Setup /proc/ide/via entry. diff -ur linux-2.5.74/drivers/ide/setup-pci.c linux-2.5.74-zee-pci_name/drivers/ide/setup-pci.c --- linux-2.5.74/drivers/ide/setup-pci.c 2003-07-02 16:46:16.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/ide/setup-pci.c 2003-07-03 19:27:39.000000000 -0400 @@ -285,10 +285,10 @@ if ((d->vendor != dev->vendor) && (d->device != dev->device)) { printk(KERN_INFO "%s: unknown IDE controller at PCI slot " "%s, VID=%04x, DID=%04x\n", - d->name, dev->slot_name, dev->vendor, dev->device); + d->name, pci_name(dev), dev->vendor, dev->device); } else { printk(KERN_INFO "%s: IDE controller at PCI slot %s\n", - d->name, dev->slot_name); + d->name, pci_name(dev)); } } diff -ur linux-2.5.74/drivers/input/gameport/cs461x.c linux-2.5.74-zee-pci_name/drivers/input/gameport/cs461x.c --- linux-2.5.74/drivers/input/gameport/cs461x.c 2003-07-02 16:40:29.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/input/gameport/cs461x.c 2003-07-03 19:24:02.000000000 -0400 @@ -287,7 +287,7 @@ port->read = cs461x_gameport_read; port->cooked_read = cs461x_gameport_cooked_read; - sprintf(phys, "pci%s/gameport0", pdev->slot_name); + sprintf(phys, "pci%s/gameport0", pci_name(pdev)); port->name = name; port->phys = phys; @@ -301,7 +301,7 @@ gameport_register_port(port); printk(KERN_INFO "gameport: %s on pci%s speed %d kHz\n", - name, pdev->slot_name, port->speed); + name, pci_name(pdev), port->speed); return 0; } diff -ur linux-2.5.74/drivers/input/gameport/emu10k1-gp.c linux-2.5.74-zee-pci_name/drivers/input/gameport/emu10k1-gp.c --- linux-2.5.74/drivers/input/gameport/emu10k1-gp.c 2003-07-02 16:49:27.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/input/gameport/emu10k1-gp.c 2003-07-03 19:25:15.000000000 -0400 @@ -78,7 +78,7 @@ } memset(emu, 0, sizeof(struct emu)); - sprintf(emu->phys, "pci%s/gameport0", pdev->slot_name); + sprintf(emu->phys, "pci%s/gameport0", pci_name(pdev)); emu->size = iolen; emu->dev = pdev; @@ -95,7 +95,7 @@ gameport_register_port(&emu->gameport); printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n", - pdev->dev.name, pdev->slot_name, emu->gameport.speed); + pdev->dev.name, pci_name(pdev), emu->gameport.speed); return 0; } diff -ur linux-2.5.74/drivers/input/gameport/fm801-gp.c linux-2.5.74-zee-pci_name/drivers/input/gameport/fm801-gp.c --- linux-2.5.74/drivers/input/gameport/fm801-gp.c 2003-07-02 16:49:17.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/input/gameport/fm801-gp.c 2003-07-03 19:24:37.000000000 -0400 @@ -116,7 +116,7 @@ gameport_register_port(&gp->gameport); printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n", - pci->dev.name, pci->slot_name, gp->gameport.speed); + pci->dev.name, pci_name(pci), gp->gameport.speed); return 0; } diff -ur linux-2.5.74/drivers/input/gameport/vortex.c linux-2.5.74-zee-pci_name/drivers/input/gameport/vortex.c --- linux-2.5.74/drivers/input/gameport/vortex.c 2003-07-02 16:53:04.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/input/gameport/vortex.c 2003-07-03 19:25:49.000000000 -0400 @@ -115,7 +115,7 @@ memset(vortex, 0, sizeof(struct vortex)); vortex->dev = dev; - sprintf(vortex->phys, "pci%s/gameport0", dev->slot_name); + sprintf(vortex->phys, "pci%s/gameport0", pci_name(dev)); pci_set_drvdata(dev, vortex); @@ -146,7 +146,7 @@ gameport_register_port(&vortex->gameport); printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n", - dev->dev.name, dev->slot_name, vortex->gameport.speed); + dev->dev.name, pci_name(dev), vortex->gameport.speed); return 0; } diff -ur linux-2.5.74/drivers/isdn/hisax/hisax_fcpcipnp.c linux-2.5.74-zee-pci_name/drivers/isdn/hisax/hisax_fcpcipnp.c --- linux-2.5.74/drivers/isdn/hisax/hisax_fcpcipnp.c 2003-07-02 16:52:45.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/isdn/hisax/hisax_fcpcipnp.c 2003-07-03 18:00:04.000000000 -0400 @@ -878,7 +878,7 @@ adapter->irq = pdev->irq; printk(KERN_INFO "hisax_fcpcipnp: found adapter %s at %s\n", - (char *) ent->driver_data, pdev->slot_name); + (char *) ent->driver_data, pci_name(pdev)); retval = fcpcipnp_setup(adapter); if (retval) diff -ur linux-2.5.74/drivers/isdn/hisax/hisax_hfcpci.c linux-2.5.74-zee-pci_name/drivers/isdn/hisax/hisax_hfcpci.c --- linux-2.5.74/drivers/isdn/hisax/hisax_hfcpci.c 2003-07-02 16:45:13.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/isdn/hisax/hisax_hfcpci.c 2003-07-03 17:59:33.000000000 -0400 @@ -1567,7 +1567,7 @@ hfcpci_hw_init(adapter); printk(KERN_INFO "hisax_hfcpci: found adapter %s at %s\n", - (char *) ent->driver_data, pdev->slot_name); + (char *) ent->driver_data, pci_name(pdev)); return 0; diff -ur linux-2.5.74/drivers/media/common/saa7146_video.c linux-2.5.74-zee-pci_name/drivers/media/common/saa7146_video.c --- linux-2.5.74/drivers/media/common/saa7146_video.c 2003-07-02 16:50:16.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/media/common/saa7146_video.c 2003-07-03 18:06:58.000000000 -0400 @@ -786,7 +786,7 @@ strcpy(cap->driver, "saa7146 v4l2"); strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); - sprintf(cap->bus_info,"PCI:%s",dev->pci->slot_name); + sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); cap->version = SAA7146_VERSION_CODE; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | diff -ur linux-2.5.74/drivers/media/video/bttv-driver.c linux-2.5.74-zee-pci_name/drivers/media/video/bttv-driver.c --- linux-2.5.74/drivers/media/video/bttv-driver.c 2003-07-02 16:52:52.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/media/video/bttv-driver.c 2003-07-03 18:04:50.000000000 -0400 @@ -2310,7 +2310,7 @@ return -EINVAL; strcpy(cap->driver,"bttv"); strlcpy(cap->card,btv->video_dev.name,sizeof(cap->card)); - sprintf(cap->bus_info,"PCI:%s",btv->dev->slot_name); + sprintf(cap->bus_info,"PCI:%s",pci_name(btv->dev)); cap->version = BTTV_VERSION_CODE; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | @@ -3351,7 +3351,7 @@ pci_read_config_byte(dev, PCI_CLASS_REVISION, &btv->revision); pci_read_config_byte(dev, PCI_LATENCY_TIMER, &lat); printk(KERN_INFO "bttv%d: Bt%d (rev %d) at %s, ", - bttv_num,btv->id, btv->revision, dev->slot_name); + bttv_num,btv->id, btv->revision, pci_name(dev)); printk("irq: %d, latency: %d, mmio: 0x%lx\n", btv->dev->irq, lat, pci_resource_start(dev,0)); diff -ur linux-2.5.74/drivers/media/video/saa7134/saa7134-core.c linux-2.5.74-zee-pci_name/drivers/media/video/saa7134/saa7134-core.c --- linux-2.5.74/drivers/media/video/saa7134/saa7134-core.c 2003-07-02 16:44:38.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/media/video/saa7134/saa7134-core.c 2003-07-03 18:04:00.000000000 -0400 @@ -746,7 +746,7 @@ pci_read_config_byte(pci_dev, PCI_LATENCY_TIMER, &dev->pci_lat); printk(KERN_INFO "%s: found at %s, rev: %d, irq: %d, " "latency: %d, mmio: 0x%lx\n", dev->name, - pci_dev->slot_name, dev->pci_rev, pci_dev->irq, + pci_name(pci_dev), dev->pci_rev, pci_dev->irq, dev->pci_lat,pci_resource_start(pci_dev,0)); pci_set_master(pci_dev); if (!pci_dma_supported(pci_dev,0xffffffff)) { diff -ur linux-2.5.74/drivers/media/video/saa7134/saa7134-ts.c linux-2.5.74-zee-pci_name/drivers/media/video/saa7134/saa7134-ts.c --- linux-2.5.74/drivers/media/video/saa7134/saa7134-ts.c 2003-07-02 16:40:06.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/media/video/saa7134/saa7134-ts.c 2003-07-03 18:02:25.000000000 -0400 @@ -253,7 +253,7 @@ strcpy(cap->driver, "saa7134"); strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card)); - sprintf(cap->bus_info,"PCI:%s",dev->pci->slot_name); + sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); cap->version = SAA7134_VERSION_CODE; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | diff -ur linux-2.5.74/drivers/media/video/saa7134/saa7134-video.c linux-2.5.74-zee-pci_name/drivers/media/video/saa7134/saa7134-video.c --- linux-2.5.74/drivers/media/video/saa7134/saa7134-video.c 2003-07-02 16:42:02.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/media/video/saa7134/saa7134-video.c 2003-07-03 18:03:30.000000000 -0400 @@ -1503,7 +1503,7 @@ strcpy(cap->driver, "saa7134"); strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card)); - sprintf(cap->bus_info,"PCI:%s",dev->pci->slot_name); + sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); cap->version = SAA7134_VERSION_CODE; cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | @@ -1903,7 +1903,7 @@ strcpy(cap->driver, "saa7134"); strlcpy(cap->card, saa7134_boards[dev->board].name, sizeof(cap->card)); - sprintf(cap->bus_info,"PCI:%s",dev->pci->slot_name); + sprintf(cap->bus_info,"PCI:%s",pci_name(dev->pci)); cap->version = SAA7134_VERSION_CODE; cap->capabilities = V4L2_CAP_TUNER; return 0; diff -ur linux-2.5.74/drivers/mtd/maps/pci.c linux-2.5.74-zee-pci_name/drivers/mtd/maps/pci.c --- linux-2.5.74/drivers/mtd/maps/pci.c 2003-07-02 16:46:05.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/mtd/maps/pci.c 2003-07-03 19:19:29.000000000 -0400 @@ -140,7 +140,7 @@ pci_read_config_dword(dev, PCI_ROM_ADDRESS, &val); val |= PCI_ROM_ADDRESS_ENABLE; pci_write_config_dword(dev, PCI_ROM_ADDRESS, val); - printk("%s: enabling expansion ROM\n", dev->slot_name); + printk("%s: enabling expansion ROM\n", pci_name(dev)); } } @@ -306,7 +306,7 @@ goto release; map->map = mtd_pci_map; - map->map.name = dev->slot_name; + map->map.name = pci_name(dev); map->dev = dev; map->exit = info->exit; map->translate = info->translate; diff -ur linux-2.5.74/drivers/net/3c59x.c linux-2.5.74-zee-pci_name/drivers/net/3c59x.c --- linux-2.5.74/drivers/net/3c59x.c 2003-07-02 16:39:18.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/3c59x.c 2003-07-03 16:46:12.000000000 -0400 @@ -1100,7 +1100,7 @@ if (gendev) { if ((pdev = DEVICE_PCI(gendev))) { - print_name = pdev->slot_name; + print_name = pci_name(pdev); } if ((edev = DEVICE_EISA(gendev))) { @@ -2845,7 +2845,7 @@ strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); if (VORTEX_PCI(vp)) - strcpy(info.bus_info, VORTEX_PCI(vp)->slot_name); + strcpy(info.bus_info, pci_name(VORTEX_PCI(vp))); else { if (VORTEX_EISA(vp)) sprintf (info.bus_info, vp->gendev->bus_id); diff -ur linux-2.5.74/drivers/net/8139cp.c linux-2.5.74-zee-pci_name/drivers/net/8139cp.c --- linux-2.5.74/drivers/net/8139cp.c 2003-07-02 16:46:58.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/8139cp.c 2003-07-03 17:21:58.000000000 -0400 @@ -1373,7 +1373,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); - strcpy (info.bus_info, cp->pdev->slot_name); + strcpy (info.bus_info, pci_name(cp->pdev)); info.regdump_len = CP_REGS_SIZE; info.n_stats = CP_NUM_STATS; if (copy_to_user (useraddr, &info, sizeof (info))) @@ -1792,7 +1792,7 @@ if (pdev->vendor == PCI_VENDOR_ID_REALTEK && pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev < 0x20) { printk(KERN_ERR PFX "pci dev %s (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n", - pdev->slot_name, pdev->vendor, pdev->device, pci_rev); + pci_name(pdev), pdev->vendor, pdev->device, pci_rev); printk(KERN_ERR PFX "Try the \"8139too\" driver instead.\n"); return -ENODEV; } @@ -1828,20 +1828,20 @@ if (pdev->irq < 2) { rc = -EIO; printk(KERN_ERR PFX "invalid irq (%d) for pci dev %s\n", - pdev->irq, pdev->slot_name); + pdev->irq, pci_name(pdev)); goto err_out_res; } pciaddr = pci_resource_start(pdev, 1); if (!pciaddr) { rc = -EIO; printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n", - pdev->slot_name); + pci_name(pdev)); goto err_out_res; } if (pci_resource_len(pdev, 1) < CP_REGS_SIZE) { rc = -EIO; printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n", - pci_resource_len(pdev, 1), pdev->slot_name); + pci_resource_len(pdev, 1), pci_name(pdev)); goto err_out_res; } @@ -1862,7 +1862,7 @@ if (!regs) { rc = -EIO; printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n", - pci_resource_len(pdev, 1), pciaddr, pdev->slot_name); + pci_resource_len(pdev, 1), pciaddr, pci_name(pdev)); goto err_out_res; } dev->base_addr = (unsigned long) regs; diff -ur linux-2.5.74/drivers/net/8139too.c linux-2.5.74-zee-pci_name/drivers/net/8139too.c --- linux-2.5.74/drivers/net/8139too.c 2003-07-02 16:38:41.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/8139too.c 2003-07-03 16:33:33.000000000 -0400 @@ -764,7 +764,7 @@ /* dev and dev->priv zeroed in alloc_etherdev */ dev = alloc_etherdev (sizeof (*tp)); if (dev == NULL) { - printk (KERN_ERR PFX "%s: Unable to alloc new net device\n", pdev->slot_name); + printk (KERN_ERR PFX "%s: Unable to alloc new net device\n", pci_name(pdev)); return -ENOMEM; } SET_MODULE_OWNER(dev); @@ -796,25 +796,25 @@ #ifdef USE_IO_OPS /* make sure PCI base addr 0 is PIO */ if (!(pio_flags & IORESOURCE_IO)) { - printk (KERN_ERR PFX "%s: region #0 not a PIO resource, aborting\n", pdev->slot_name); + printk (KERN_ERR PFX "%s: region #0 not a PIO resource, aborting\n", pci_name(pdev)); rc = -ENODEV; goto err_out; } /* check for weird/broken PCI region reporting */ if (pio_len < RTL_MIN_IO_SIZE) { - printk (KERN_ERR PFX "%s: Invalid PCI I/O region size(s), aborting\n", pdev->slot_name); + printk (KERN_ERR PFX "%s: Invalid PCI I/O region size(s), aborting\n", pci_name(pdev)); rc = -ENODEV; goto err_out; } #else /* make sure PCI base addr 1 is MMIO */ if (!(mmio_flags & IORESOURCE_MEM)) { - printk (KERN_ERR PFX "%s: region #1 not an MMIO resource, aborting\n", pdev->slot_name); + printk (KERN_ERR PFX "%s: region #1 not an MMIO resource, aborting\n", pci_name(pdev)); rc = -ENODEV; goto err_out; } if (mmio_len < RTL_MIN_IO_SIZE) { - printk (KERN_ERR PFX "%s: Invalid PCI mem region size(s), aborting\n", pdev->slot_name); + printk (KERN_ERR PFX "%s: Invalid PCI mem region size(s), aborting\n", pci_name(pdev)); rc = -ENODEV; goto err_out; } @@ -836,7 +836,7 @@ /* ioremap MMIO region */ ioaddr = ioremap (mmio_start, mmio_len); if (ioaddr == NULL) { - printk (KERN_ERR PFX "%s: cannot remap MMIO, aborting\n", pdev->slot_name); + printk (KERN_ERR PFX "%s: cannot remap MMIO, aborting\n", pci_name(pdev)); rc = -EIO; goto err_out; } @@ -851,7 +851,7 @@ /* check for missing/broken hardware */ if (RTL_R32 (TxConfig) == 0xFFFFFFFF) { printk (KERN_ERR PFX "%s: Chip not responding, ignoring board\n", - pdev->slot_name); + pci_name(pdev)); rc = -EIO; goto err_out; } @@ -866,8 +866,8 @@ /* if unknown chip, assume array element #0, original RTL-8139 in this case */ printk (KERN_DEBUG PFX "%s: unknown chip version, assuming RTL-8139\n", - pdev->slot_name); - printk (KERN_DEBUG PFX "%s: TxConfig = 0x%lx\n", pdev->slot_name, RTL_R32 (TxConfig)); + pci_name(pdev)); + printk (KERN_DEBUG PFX "%s: TxConfig = 0x%lx\n", pci_name(pdev), RTL_R32 (TxConfig)); tp->chipset = 0; match: @@ -942,7 +942,7 @@ if (pdev->vendor == PCI_VENDOR_ID_REALTEK && pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pci_rev >= 0x20) { printk(KERN_INFO PFX "pci dev %s (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n", - pdev->slot_name, pdev->vendor, pdev->device, pci_rev); + pci_name(pdev), pdev->vendor, pdev->device, pci_rev); printk(KERN_INFO PFX "Use the \"8139cp\" driver for improved performance and stability.\n"); } @@ -2256,7 +2256,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); - strcpy (info.bus_info, np->pci_dev->slot_name); + strcpy (info.bus_info, pci_name(np->pci_dev)); info.regdump_len = np->regs_len; if (copy_to_user (useraddr, &info, sizeof (info))) return -EFAULT; diff -ur linux-2.5.74/drivers/net/acenic.c linux-2.5.74-zee-pci_name/drivers/net/acenic.c --- linux-2.5.74/drivers/net/acenic.c 2003-07-02 16:46:58.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/acenic.c 2003-07-03 17:18:53.000000000 -0400 @@ -3088,7 +3088,7 @@ tigonFwReleaseFix); strncpy(info.version, version, sizeof(info.version) - 1); if (ap && ap->pdev) - strcpy(info.bus_info, ap->pdev->slot_name); + strcpy(info.bus_info, pci_name(ap->pdev)); if (copy_to_user(ifr->ifr_data, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/amd8111e.c linux-2.5.74-zee-pci_name/drivers/net/amd8111e.c --- linux-2.5.74/drivers/net/amd8111e.c 2003-07-02 16:49:16.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/amd8111e.c 2003-07-03 17:25:25.000000000 -0400 @@ -1405,7 +1405,7 @@ strcpy (info.version, MODULE_VERSION); memset(&info.fw_version, 0, sizeof(info.fw_version)); sprintf(info.fw_version,"%u",chip_version); - strcpy (info.bus_info, pci_dev->slot_name); + strcpy (info.bus_info, pci_name(pci_dev)); info.eedump_len = 0; info.regdump_len = AMD8111E_REG_DUMP_LEN; if (copy_to_user (useraddr, &info, sizeof(info))) diff -ur linux-2.5.74/drivers/net/b44.c linux-2.5.74-zee-pci_name/drivers/net/b44.c --- linux-2.5.74/drivers/net/b44.c 2003-07-02 16:46:23.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/b44.c 2003-07-03 17:15:02.000000000 -0400 @@ -1372,7 +1372,7 @@ strcpy (info.driver, DRV_MODULE_NAME); strcpy (info.version, DRV_MODULE_VERSION); memset(&info.fw_version, 0, sizeof(info.fw_version)); - strcpy (info.bus_info, pci_dev->slot_name); + strcpy (info.bus_info, pci_name(pci_dev)); info.eedump_len = 0; info.regdump_len = 0; if (copy_to_user (useraddr, &info, sizeof (info))) diff -ur linux-2.5.74/drivers/net/dl2k.c linux-2.5.74-zee-pci_name/drivers/net/dl2k.c --- linux-2.5.74/drivers/net/dl2k.c 2003-07-02 16:46:18.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/dl2k.c 2003-07-03 17:14:10.000000000 -0400 @@ -1201,7 +1201,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy(info.driver, "DL2K"); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, np->pdev->slot_name); + strcpy(info.bus_info, pci_name(np->pdev)); memset(&info.fw_version, 0, sizeof(info.fw_version)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; diff -ur linux-2.5.74/drivers/net/e100/e100_main.c linux-2.5.74-zee-pci_name/drivers/net/e100/e100_main.c --- linux-2.5.74/drivers/net/e100/e100_main.c 2003-07-02 16:47:01.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/e100/e100_main.c 2003-07-03 16:44:39.000000000 -0400 @@ -3600,7 +3600,7 @@ strncpy(info.version, e100_driver_version, sizeof (info.version) - 1); strncpy(info.fw_version, "N/A", sizeof (info.fw_version) - 1); - strncpy(info.bus_info, bdp->pdev->slot_name, + strncpy(info.bus_info, pci_name(bdp->pdev), sizeof (info.bus_info) - 1); info.n_stats = E100_STATS_LEN; info.regdump_len = E100_REGS_LEN * sizeof(u32); diff -ur linux-2.5.74/drivers/net/e1000/e1000_ethtool.c linux-2.5.74-zee-pci_name/drivers/net/e1000/e1000_ethtool.c --- linux-2.5.74/drivers/net/e1000/e1000_ethtool.c 2003-07-02 16:46:57.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/e1000/e1000_ethtool.c 2003-07-03 16:47:21.000000000 -0400 @@ -197,7 +197,7 @@ strncpy(drvinfo->driver, e1000_driver_name, 32); strncpy(drvinfo->version, e1000_driver_version, 32); strncpy(drvinfo->fw_version, "N/A", 32); - strncpy(drvinfo->bus_info, adapter->pdev->slot_name, 32); + strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32); drvinfo->n_stats = E1000_STATS_LEN; drvinfo->testinfo_len = E1000_TEST_LEN; #define E1000_REGS_LEN 32 diff -ur linux-2.5.74/drivers/net/eepro100.c linux-2.5.74-zee-pci_name/drivers/net/eepro100.c --- linux-2.5.74/drivers/net/eepro100.c 2003-07-02 16:50:17.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/eepro100.c 2003-07-03 17:33:42.000000000 -0400 @@ -2007,7 +2007,7 @@ strncpy(info.driver, "eepro100", sizeof(info.driver)-1); strncpy(info.version, version, sizeof(info.version)-1); if (sp && sp->pdev) - strcpy(info.bus_info, sp->pdev->slot_name); + strcpy(info.bus_info, pci_name(sp->pdev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/epic100.c linux-2.5.74-zee-pci_name/drivers/net/epic100.c --- linux-2.5.74/drivers/net/epic100.c 2003-07-02 16:46:57.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/epic100.c 2003-07-03 17:18:19.000000000 -0400 @@ -479,7 +479,7 @@ if (debug > 2) { printk(KERN_DEBUG DRV_NAME "(%s): EEPROM contents\n", - pdev->slot_name); + pci_name(pdev)); for (i = 0; i < 64; i++) printk(" %4.4x%s", read_eeprom(ioaddr, i), i % 16 == 15 ? "\n" : ""); @@ -500,7 +500,7 @@ ep->phys[phy_idx++] = phy; printk(KERN_INFO DRV_NAME "(%s): MII transceiver #%d control " "%4.4x status %4.4x.\n", - pdev->slot_name, phy, mdio_read(dev, phy, 0), mii_status); + pci_name(pdev), phy, mdio_read(dev, phy, 0), mii_status); } } ep->mii_phy_cnt = phy_idx; @@ -509,10 +509,10 @@ ep->mii.advertising = mdio_read(dev, phy, MII_ADVERTISE); printk(KERN_INFO DRV_NAME "(%s): Autonegotiation advertising %4.4x link " "partner %4.4x.\n", - pdev->slot_name, ep->mii.advertising, mdio_read(dev, phy, 5)); + pci_name(pdev), ep->mii.advertising, mdio_read(dev, phy, 5)); } else if ( ! (ep->chip_flags & NO_MII)) { printk(KERN_WARNING DRV_NAME "(%s): ***WARNING***: No MII transceiver found!\n", - pdev->slot_name); + pci_name(pdev)); /* Use the known PHY address of the EPII. */ ep->phys[0] = 3; } @@ -528,7 +528,7 @@ if (duplex) { ep->mii.force_media = ep->mii.full_duplex = 1; printk(KERN_INFO DRV_NAME "(%s): Forced full duplex operation requested.\n", - pdev->slot_name); + pci_name(pdev)); } dev->if_port = ep->default_port = option; @@ -1374,7 +1374,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); - strcpy (info.bus_info, np->pci_dev->slot_name); + strcpy (info.bus_info, pci_name(np->pci_dev)); if (copy_to_user (useraddr, &info, sizeof (info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/fealnx.c linux-2.5.74-zee-pci_name/drivers/net/fealnx.c --- linux-2.5.74/drivers/net/fealnx.c 2003-07-02 16:51:11.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/fealnx.c 2003-07-03 17:34:05.000000000 -0400 @@ -1773,7 +1773,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); - strcpy (info.bus_info, np->pci_dev->slot_name); + strcpy (info.bus_info, pci_name(np->pci_dev)); if (copy_to_user (useraddr, &info, sizeof (info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/hamachi.c linux-2.5.74-zee-pci_name/drivers/net/hamachi.c --- linux-2.5.74/drivers/net/hamachi.c 2003-07-02 16:58:07.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/hamachi.c 2003-07-03 17:39:02.000000000 -0400 @@ -1872,7 +1872,7 @@ struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, np->pci_dev->slot_name); + strcpy(info.bus_info, pci_name(np->pci_dev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/ioc3-eth.c linux-2.5.74-zee-pci_name/drivers/net/ioc3-eth.c --- linux-2.5.74/drivers/net/ioc3-eth.c 2003-07-02 16:40:55.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/ioc3-eth.c 2003-07-03 17:00:04.000000000 -0400 @@ -1453,7 +1453,7 @@ ioc3 = (struct ioc3 *) ioremap(ioc3_base, ioc3_size); if (!ioc3) { printk(KERN_CRIT "ioc3eth(%s): ioremap failed, goodbye.\n", - pdev->slot_name); + pci_name(pdev)); err = -ENOMEM; goto out_res; } @@ -1473,7 +1473,7 @@ if (ip->phy == -1) { printk(KERN_CRIT "ioc3-eth(%s): Didn't find a PHY, goodbye.\n", - pdev->slot_name); + pci_name(pdev)); err = -ENODEV; goto out_stop; } diff -ur linux-2.5.74/drivers/net/ixgb/ixgb_ethtool.c linux-2.5.74-zee-pci_name/drivers/net/ixgb/ixgb_ethtool.c --- linux-2.5.74/drivers/net/ixgb/ixgb_ethtool.c 2003-07-02 16:55:15.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/ixgb/ixgb_ethtool.c 2003-07-03 16:46:54.000000000 -0400 @@ -119,7 +119,7 @@ strncpy(drvinfo->driver, ixgb_driver_name, 32); strncpy(drvinfo->version, ixgb_driver_version, 32); strncpy(drvinfo->fw_version, "", 32); - strncpy(drvinfo->bus_info, adapter->pdev->slot_name, 32); + strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32); #ifdef ETHTOOL_GREGS drvinfo->regdump_len = IXGB_REG_DUMP_LEN; #endif /* ETHTOOL_GREGS */ diff -ur linux-2.5.74/drivers/net/natsemi.c linux-2.5.74-zee-pci_name/drivers/net/natsemi.c --- linux-2.5.74/drivers/net/natsemi.c 2003-07-02 16:40:30.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/natsemi.c 2003-07-03 16:49:50.000000000 -0400 @@ -1967,7 +1967,7 @@ strncpy(info.driver, DRV_NAME, ETHTOOL_BUSINFO_LEN); strncpy(info.version, DRV_VERSION, ETHTOOL_BUSINFO_LEN); info.fw_version[0] = '\0'; - strncpy(info.bus_info, np->pci_dev->slot_name, + strncpy(info.bus_info, pci_name(np->pci_dev), ETHTOOL_BUSINFO_LEN); info.eedump_len = NATSEMI_EEPROM_SIZE; info.regdump_len = NATSEMI_REGS_SIZE; diff -ur linux-2.5.74/drivers/net/ne2k-pci.c linux-2.5.74-zee-pci_name/drivers/net/ne2k-pci.c --- linux-2.5.74/drivers/net/ne2k-pci.c 2003-07-02 16:42:52.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/ne2k-pci.c 2003-07-03 17:05:49.000000000 -0400 @@ -334,7 +334,7 @@ /* Allocate dev->priv and fill in 8390 specific dev fields. */ if (ethdev_init(dev)) { printk (KERN_ERR "ne2kpci(%s): unable to get memory for dev->priv.\n", - pdev->slot_name); + pci_name(pdev)); goto err_out_free_netdev; } @@ -605,7 +605,7 @@ struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, pci_dev->slot_name); + strcpy(info.bus_info, pci_name(pci_dev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/ns83820.c linux-2.5.74-zee-pci_name/drivers/net/ns83820.c --- linux-2.5.74/drivers/net/ns83820.c 2003-07-02 16:57:10.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/ns83820.c 2003-07-03 17:37:33.000000000 -0400 @@ -1186,7 +1186,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy(info.driver, "ns83820"); strcpy(info.version, VERSION); - strcpy(info.bus_info, dev->pci_dev->slot_name); + strcpy(info.bus_info, pci_name(dev->pci_dev)); if (copy_to_user(useraddr, &info, sizeof (info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/pci-skeleton.c linux-2.5.74-zee-pci_name/drivers/net/pci-skeleton.c --- linux-2.5.74/drivers/net/pci-skeleton.c 2003-07-02 16:40:15.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/pci-skeleton.c 2003-07-03 16:48:24.000000000 -0400 @@ -704,8 +704,8 @@ /* if unknown chip, assume array element #0, original RTL-8139 in this case */ printk (KERN_DEBUG PFX "PCI device %s: unknown chip version, assuming RTL-8139\n", - pdev->slot_name); - printk (KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n", pdev->slot_name, NETDRV_R32 (TxConfig)); + pci_name(pdev)); + printk (KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n", pci_name(pdev), NETDRV_R32 (TxConfig)); tp->chipset = 0; match: diff -ur linux-2.5.74/drivers/net/pcnet32.c linux-2.5.74-zee-pci_name/drivers/net/pcnet32.c --- linux-2.5.74/drivers/net/pcnet32.c 2003-07-02 16:43:55.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/pcnet32.c 2003-07-03 17:11:38.000000000 -0400 @@ -1588,7 +1588,7 @@ strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); if (lp->pci_dev) - strcpy (info.bus_info, lp->pci_dev->slot_name); + strcpy (info.bus_info, pci_name(lp->pci_dev)); else sprintf(info.bus_info, "VLB 0x%lx", dev->base_addr); if (copy_to_user (useraddr, &info, sizeof (info))) diff -ur linux-2.5.74/drivers/net/r8169.c linux-2.5.74-zee-pci_name/drivers/net/r8169.c --- linux-2.5.74/drivers/net/r8169.c 2003-07-02 16:48:13.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/r8169.c 2003-07-03 17:22:53.000000000 -0400 @@ -437,9 +437,9 @@ //if unknown chip, assume array element #0, original RTL-8169 in this case printk(KERN_DEBUG PFX "PCI device %s: unknown chip version, assuming RTL-8169\n", - pdev->slot_name); + pci_name(pdev)); printk(KERN_DEBUG PFX "PCI device %s: TxConfig = 0x%lx\n", - pdev->slot_name, (unsigned long) RTL_R32(TxConfig)); + pci_name(pdev), (unsigned long) RTL_R32(TxConfig)); tp->chipset = 0; match: diff -ur linux-2.5.74/drivers/net/sis900.c linux-2.5.74-zee-pci_name/drivers/net/sis900.c --- linux-2.5.74/drivers/net/sis900.c 2003-07-02 16:46:46.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/sis900.c 2003-07-03 17:15:37.000000000 -0400 @@ -1874,7 +1874,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, SIS900_MODULE_NAME); strcpy (info.version, SIS900_DRV_VERSION); - strcpy (info.bus_info, sis_priv->pci_dev->slot_name); + strcpy (info.bus_info, pci_name(sis_priv->pci_dev)); if (copy_to_user (useraddr, &info, sizeof (info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/starfire.c linux-2.5.74-zee-pci_name/drivers/net/starfire.c --- linux-2.5.74/drivers/net/starfire.c 2003-07-02 16:43:41.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/starfire.c 2003-07-03 17:11:02.000000000 -0400 @@ -323,7 +323,7 @@ #define netif_start_if(dev) #define netif_stop_if(dev) -#define PCI_SLOT_NAME(pci_dev) (pci_dev)->slot_name +#define PCI_SLOT_NAME(pci_dev) pci_name(pci_dev) #endif /* LINUX_VERSION_CODE > 0x20300 */ diff -ur linux-2.5.74/drivers/net/sundance.c linux-2.5.74-zee-pci_name/drivers/net/sundance.c --- linux-2.5.74/drivers/net/sundance.c 2003-07-02 16:49:31.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/sundance.c 2003-07-03 17:26:00.000000000 -0400 @@ -1578,7 +1578,7 @@ struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, np->pci_dev->slot_name); + strcpy(info.bus_info, pci_name(np->pci_dev)); memset(&info.fw_version, 0, sizeof(info.fw_version)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; diff -ur linux-2.5.74/drivers/net/sungem.c linux-2.5.74-zee-pci_name/drivers/net/sungem.c --- linux-2.5.74/drivers/net/sungem.c 2003-07-02 16:56:42.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/sungem.c 2003-07-03 17:35:09.000000000 -0400 @@ -2338,7 +2338,7 @@ strncpy(info.driver, DRV_NAME, ETHTOOL_BUSINFO_LEN); strncpy(info.version, DRV_VERSION, ETHTOOL_BUSINFO_LEN); info.fw_version[0] = '\0'; - strncpy(info.bus_info, gp->pdev->slot_name, ETHTOOL_BUSINFO_LEN); + strncpy(info.bus_info, pci_name(gp->pdev), ETHTOOL_BUSINFO_LEN); info.regdump_len = 0; /*SUNGEM_NREGS;*/ if (copy_to_user(ep_user, &info, sizeof(info))) diff -ur linux-2.5.74/drivers/net/tg3.c linux-2.5.74-zee-pci_name/drivers/net/tg3.c --- linux-2.5.74/drivers/net/tg3.c 2003-07-02 16:49:07.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/tg3.c 2003-07-03 17:24:29.000000000 -0400 @@ -5118,7 +5118,7 @@ strcpy (info.driver, DRV_MODULE_NAME); strcpy (info.version, DRV_MODULE_VERSION); memset(&info.fw_version, 0, sizeof(info.fw_version)); - strcpy (info.bus_info, pci_dev->slot_name); + strcpy (info.bus_info, pci_name(pci_dev)); info.eedump_len = 0; info.regdump_len = TG3_REGDUMP_LEN; if (copy_to_user (useraddr, &info, sizeof (info))) @@ -6087,7 +6087,7 @@ err = tg3_set_power_state(tp, 0); if (err) { printk(KERN_ERR PFX "(%s) transition to D0 failed\n", - tp->pdev->slot_name); + pci_name(tp->pdev)); return err; } @@ -6198,7 +6198,7 @@ err = tg3_phy_probe(tp); if (err) { printk(KERN_ERR PFX "(%s) phy probe failed, err %d\n", - tp->pdev->slot_name, err); + pci_name(tp->pdev), err); /* ... but do not return immediately ... */ } diff -ur linux-2.5.74/drivers/net/tulip/de2104x.c linux-2.5.74-zee-pci_name/drivers/net/tulip/de2104x.c --- linux-2.5.74/drivers/net/tulip/de2104x.c 2003-07-02 16:53:39.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/tulip/de2104x.c 2003-07-03 16:42:46.000000000 -0400 @@ -1600,7 +1600,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); - strcpy (info.bus_info, de->pdev->slot_name); + strcpy (info.bus_info, pci_name(de->pdev)); info.eedump_len = DE_EEPROM_SIZE; info.regdump_len = DE_REGS_SIZE; if (copy_to_user (useraddr, &info, sizeof (info))) @@ -2048,7 +2048,7 @@ if (pdev->irq < 2) { rc = -EIO; printk(KERN_ERR PFX "invalid irq (%d) for pci dev %s\n", - pdev->irq, pdev->slot_name); + pdev->irq, pci_name(pdev)); goto err_out_res; } @@ -2057,13 +2057,13 @@ if (!pciaddr) { rc = -EIO; printk(KERN_ERR PFX "no MMIO resource for pci dev %s\n", - pdev->slot_name); + pci_name(pdev)); goto err_out_res; } if (pci_resource_len(pdev, 1) < DE_REGS_SIZE) { rc = -EIO; printk(KERN_ERR PFX "MMIO resource (%lx) too small on pci dev %s\n", - pci_resource_len(pdev, 1), pdev->slot_name); + pci_resource_len(pdev, 1), pci_name(pdev)); goto err_out_res; } @@ -2072,7 +2072,7 @@ if (!regs) { rc = -EIO; printk(KERN_ERR PFX "Cannot map PCI MMIO (%lx@%lx) on pci dev %s\n", - pci_resource_len(pdev, 1), pciaddr, pdev->slot_name); + pci_resource_len(pdev, 1), pciaddr, pci_name(pdev)); goto err_out_res; } dev->base_addr = (unsigned long) regs; @@ -2084,7 +2084,7 @@ rc = de_reset_mac(de); if (rc) { printk(KERN_ERR PFX "Cannot reset MAC, pci dev %s\n", - pdev->slot_name); + pci_name(pdev)); goto err_out_iomap; } diff -ur linux-2.5.74/drivers/net/tulip/dmfe.c linux-2.5.74-zee-pci_name/drivers/net/tulip/dmfe.c --- linux-2.5.74/drivers/net/tulip/dmfe.c 2003-07-02 16:55:18.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/tulip/dmfe.c 2003-07-03 16:44:02.000000000 -0400 @@ -442,7 +442,7 @@ printk(KERN_INFO "%s: Davicom DM%04lx at pci%s,", dev->name, ent->driver_data >> 16, - pdev->slot_name); + pci_name(pdev)); for (i = 0; i < 6; i++) printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]); printk(", irq %d.\n", dev->irq); @@ -1019,7 +1019,7 @@ strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); if (db->pdev) - strcpy(info.bus_info, db->pdev->slot_name); + strcpy(info.bus_info, pci_name(db->pdev)); else sprintf(info.bus_info, "EISA 0x%lx %d", dev->base_addr, dev->irq); diff -ur linux-2.5.74/drivers/net/tulip/tulip_core.c linux-2.5.74-zee-pci_name/drivers/net/tulip/tulip_core.c --- linux-2.5.74/drivers/net/tulip/tulip_core.c 2003-07-02 16:49:26.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/tulip/tulip_core.c 2003-07-03 16:40:31.000000000 -0400 @@ -858,7 +858,7 @@ struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, np->pdev->slot_name); + strcpy(info.bus_info, pci_name(np->pdev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; @@ -1172,7 +1172,7 @@ u32 csr0; if (tulip_debug > 3) - printk(KERN_DEBUG "%s: tulip_mwi_config()\n", pdev->slot_name); + printk(KERN_DEBUG "%s: tulip_mwi_config()\n", pci_name(pdev)); tp->csr0 = csr0 = 0; @@ -1240,7 +1240,7 @@ tp->csr0 = csr0; if (tulip_debug > 2) printk(KERN_DEBUG "%s: MWI config cacheline=%d, csr0=%08x\n", - pdev->slot_name, cache, csr0); + pci_name(pdev), cache, csr0); } #endif @@ -1365,7 +1365,7 @@ SET_NETDEV_DEV(dev, &pdev->dev); if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) { printk (KERN_ERR PFX "%s: I/O region (0x%lx@0x%lx) too small, " - "aborting\n", pdev->slot_name, + "aborting\n", pci_name(pdev), pci_resource_len (pdev, 0), pci_resource_start (pdev, 0)); goto err_out_free_netdev; diff -ur linux-2.5.74/drivers/net/tulip/winbond-840.c linux-2.5.74-zee-pci_name/drivers/net/tulip/winbond-840.c --- linux-2.5.74/drivers/net/tulip/winbond-840.c 2003-07-02 16:42:44.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/tulip/winbond-840.c 2003-07-03 16:36:21.000000000 -0400 @@ -416,7 +416,7 @@ if (pci_set_dma_mask(pdev,0xFFFFffff)) { printk(KERN_WARNING "Winbond-840: Device %s disabled due to DMA limitations.\n", - pdev->slot_name); + pci_name(pdev)); return -EIO; } dev = alloc_etherdev(sizeof(*np)); @@ -1465,7 +1465,7 @@ struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, np->pci_dev->slot_name); + strcpy(info.bus_info, pci_name(np->pci_dev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/tulip/xircom_tulip_cb.c linux-2.5.74-zee-pci_name/drivers/net/tulip/xircom_tulip_cb.c --- linux-2.5.74/drivers/net/tulip/xircom_tulip_cb.c 2003-07-02 16:41:53.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/tulip/xircom_tulip_cb.c 2003-07-03 16:34:33.000000000 -0400 @@ -544,7 +544,7 @@ printk(version); #endif - //printk(KERN_INFO "xircom_init_one(%s)\n", pdev->slot_name); + //printk(KERN_INFO "xircom_init_one(%s)\n", pci_name(pdev)); board_idx++; @@ -1448,7 +1448,7 @@ strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); *info.fw_version = 0; - strcpy(info.bus_info, tp->pdev->slot_name); + strcpy(info.bus_info, pci_name(tp->pdev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/typhoon.c linux-2.5.74-zee-pci_name/drivers/net/typhoon.c --- linux-2.5.74/drivers/net/typhoon.c 2003-07-02 16:50:08.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/typhoon.c 2003-07-03 17:32:44.000000000 -0400 @@ -1049,7 +1049,7 @@ strcpy(info->driver, DRV_MODULE_NAME); strcpy(info->version, DRV_MODULE_VERSION); - strcpy(info->bus_info, pci_dev->slot_name); + strcpy(info->bus_info, pci_name(pci_dev)); } static inline void @@ -2261,7 +2261,7 @@ dev = alloc_etherdev(sizeof(*tp)); if(dev == NULL) { printk(ERR_PFX "%s: unable to alloc new net device\n", - pdev->slot_name); + pci_name(pdev)); err = -ENOMEM; goto error_out; } @@ -2271,7 +2271,7 @@ err = pci_enable_device(pdev); if(err < 0) { printk(ERR_PFX "%s: unable to enable device\n", - pdev->slot_name); + pci_name(pdev)); goto error_out_dev; } @@ -2284,7 +2284,7 @@ err = pci_set_dma_mask(pdev, 0xffffffffULL); if(err < 0) { printk(ERR_PFX "%s: No usable DMA configuration\n", - pdev->slot_name); + pci_name(pdev)); goto error_out_dev; } @@ -2293,13 +2293,13 @@ if(!(pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) { printk(ERR_PFX "%s: region #1 not a PCI MMIO resource, aborting\n", - pdev->slot_name); + pci_name(pdev)); err = -ENODEV; goto error_out_dev; } if(pci_resource_len(pdev, 1) < 128) { printk(ERR_PFX "%s: Invalid PCI MMIO region size, aborting\n", - pdev->slot_name); + pci_name(pdev)); err = -ENODEV; goto error_out_dev; } @@ -2307,7 +2307,7 @@ err = pci_request_regions(pdev, "typhoon"); if(err < 0) { printk(ERR_PFX "%s: could not request regions\n", - pdev->slot_name); + pci_name(pdev)); goto error_out_dev; } @@ -2320,7 +2320,7 @@ ioaddr = (unsigned long) ioremap(ioaddr, 128); if(!ioaddr) { printk(ERR_PFX "%s: cannot remap MMIO, aborting\n", - pdev->slot_name); + pci_name(pdev)); err = -EIO; goto error_out_regions; } @@ -2332,7 +2332,7 @@ &shared_dma); if(!shared) { printk(ERR_PFX "%s: could not allocate DMA memory\n", - pdev->slot_name); + pci_name(pdev)); err = -ENOMEM; goto error_out_remap; } @@ -2358,7 +2358,7 @@ * 5) Put the card to sleep. */ if(typhoon_reset(ioaddr, WaitSleep) < 0) { - printk(ERR_PFX "%s: could not reset 3XP\n", pdev->slot_name); + printk(ERR_PFX "%s: could not reset 3XP\n", pci_name(pdev)); err = -EIO; goto error_out_dma; } @@ -2367,14 +2367,14 @@ * use some common routines to initialize the card. So that those * routines print the right name, we keep our oun pointer to the name */ - tp->name = pdev->slot_name; + tp->name = pci_name(pdev); typhoon_init_interface(tp); typhoon_init_rings(tp); if(typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) < 0) { printk(ERR_PFX "%s: cannot boot 3XP sleep image\n", - pdev->slot_name); + pci_name(pdev)); err = -EIO; goto error_out_reset; } @@ -2382,7 +2382,7 @@ INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_MAC_ADDRESS); if(typhoon_issue_command(tp, 1, &xp_cmd, 1, &xp_resp) < 0) { printk(ERR_PFX "%s: cannot read MAC address\n", - pdev->slot_name); + pci_name(pdev)); err = -EIO; goto error_out_reset; } @@ -2392,13 +2392,13 @@ if(!is_valid_ether_addr(dev->dev_addr)) { printk(ERR_PFX "%s: Could not obtain valid ethernet address, " - "aborting\n", pdev->slot_name); + "aborting\n", pci_name(pdev)); goto error_out_reset; } if(typhoon_sleep(tp, 3, 0) < 0) { printk(ERR_PFX "%s: cannot put adapter to sleep\n", - pdev->slot_name); + pci_name(pdev)); err = -EIO; goto error_out_reset; } diff -ur linux-2.5.74/drivers/net/via-rhine.c linux-2.5.74-zee-pci_name/drivers/net/via-rhine.c --- linux-2.5.74/drivers/net/via-rhine.c 2003-07-02 16:57:17.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/via-rhine.c 2003-07-03 17:38:36.000000000 -0400 @@ -672,7 +672,7 @@ ioaddr = (long) ioremap (memaddr, io_size); if (!ioaddr) { printk (KERN_ERR "ioremap failed for device %s, region 0x%X @ 0x%lX\n", - pdev->slot_name, io_size, memaddr); + pci_name(pdev), io_size, memaddr); goto err_out_free_res; } @@ -1733,7 +1733,7 @@ struct ethtool_drvinfo info = { ETHTOOL_GDRVINFO }; strcpy (info.driver, DRV_NAME); strcpy (info.version, DRV_VERSION); - strcpy (info.bus_info, np->pdev->slot_name); + strcpy (info.bus_info, pci_name(np->pdev)); if (copy_to_user (useraddr, &info, sizeof (info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/net/wireless/orinoco_pci.c linux-2.5.74-zee-pci_name/drivers/net/wireless/orinoco_pci.c --- linux-2.5.74/drivers/net/wireless/orinoco_pci.c 2003-07-02 16:50:56.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/wireless/orinoco_pci.c 2003-07-03 17:01:16.000000000 -0400 @@ -223,7 +223,7 @@ printk(KERN_DEBUG "Detected Orinoco/Prism2 PCI device at %s, mem:0x%lX to 0x%lX -> 0x%p, irq:%d\n", - pdev->slot_name, dev->mem_start, dev->mem_end, pci_ioaddr, pdev->irq); + pci_name(pdev), dev->mem_start, dev->mem_end, pci_ioaddr, pdev->irq); hermes_struct_init(&priv->hw, dev->base_addr, HERMES_MEM, HERMES_32BIT_REGSPACING); diff -ur linux-2.5.74/drivers/net/wireless/orinoco_plx.c linux-2.5.74-zee-pci_name/drivers/net/wireless/orinoco_plx.c --- linux-2.5.74/drivers/net/wireless/orinoco_plx.c 2003-07-02 16:57:10.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/wireless/orinoco_plx.c 2003-07-03 17:02:08.000000000 -0400 @@ -236,7 +236,7 @@ printk(KERN_DEBUG "Detected Orinoco/Prism2 PLX device at %s irq:%d, io addr:0x%lx\n", - pdev->slot_name, pdev->irq, pccard_ioaddr); + pci_name(pdev), pdev->irq, pccard_ioaddr); hermes_struct_init(&(priv->hw), dev->base_addr, HERMES_IO, HERMES_16BIT_REGSPACING); diff -ur linux-2.5.74/drivers/net/wireless/orinoco_tmd.c linux-2.5.74-zee-pci_name/drivers/net/wireless/orinoco_tmd.c --- linux-2.5.74/drivers/net/wireless/orinoco_tmd.c 2003-07-02 16:41:53.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/wireless/orinoco_tmd.c 2003-07-03 17:00:46.000000000 -0400 @@ -128,7 +128,7 @@ printk(KERN_DEBUG "Detected Orinoco/Prism2 TMD device at %s irq:%d, io addr:0x%lx\n", - pdev->slot_name, pdev->irq, pccard_ioaddr); + pci_name(pdev), pdev->irq, pccard_ioaddr); hermes_struct_init(&(priv->hw), dev->base_addr, HERMES_IO, HERMES_16BIT_REGSPACING); diff -ur linux-2.5.74/drivers/net/yellowfin.c linux-2.5.74-zee-pci_name/drivers/net/yellowfin.c --- linux-2.5.74/drivers/net/yellowfin.c 2003-07-02 16:46:02.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/net/yellowfin.c 2003-07-03 17:13:38.000000000 -0400 @@ -1413,7 +1413,7 @@ struct ethtool_drvinfo info = {ETHTOOL_GDRVINFO}; strcpy(info.driver, DRV_NAME); strcpy(info.version, DRV_VERSION); - strcpy(info.bus_info, np->pci_dev->slot_name); + strcpy(info.bus_info, pci_name(np->pci_dev)); if (copy_to_user(useraddr, &info, sizeof(info))) return -EFAULT; return 0; diff -ur linux-2.5.74/drivers/parisc/lba_pci.c linux-2.5.74-zee-pci_name/drivers/parisc/lba_pci.c --- linux-2.5.74/drivers/parisc/lba_pci.c 2003-07-02 16:51:12.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/parisc/lba_pci.c 2003-07-03 19:28:54.000000000 -0400 @@ -670,7 +670,7 @@ if (dev->resource[i].flags & srch_flags) { pci_claim_resource(dev, i); DBG(" claimed %s %d [%lx,%lx]/%x\n", - dev->slot_name, i, + pci_name(dev), i, dev->resource[i].start, dev->resource[i].end, (int) dev->resource[i].flags diff -ur linux-2.5.74/drivers/parisc/superio.c linux-2.5.74-zee-pci_name/drivers/parisc/superio.c --- linux-2.5.74/drivers/parisc/superio.c 2003-07-02 16:50:47.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/parisc/superio.c 2003-07-03 19:28:31.000000000 -0400 @@ -160,7 +160,7 @@ } printk (KERN_INFO "SuperIO: Found NS87560 Legacy I/O device at %s (IRQ %i) \n", - pdev->slot_name,sio->iosapic_irq); + pci_name(pdev),sio->iosapic_irq); /* Find our I/O devices */ pci_read_config_word (pdev, SIO_SP1BAR, &sio->sp1_base); @@ -346,7 +346,7 @@ return -1; } printk("superio_fixup_irq(%s) ven 0x%x dev 0x%x from %p\n", - pcidev->slot_name, + pci_name(pcidev), pcidev->vendor, pcidev->device, __builtin_return_address(0)); #endif @@ -487,7 +487,7 @@ { #ifdef DEBUG_INIT printk("superio_probe(%s) ven 0x%x dev 0x%x sv 0x%x sd 0x%x class 0x%x\n", - dev->slot_name, + pci_name(dev), dev->vendor, dev->device, dev->subsystem_vendor, dev->subsystem_device, dev->class); diff -ur linux-2.5.74/drivers/pci/hotplug/acpiphp_glue.c linux-2.5.74-zee-pci_name/drivers/pci/hotplug/acpiphp_glue.c --- linux-2.5.74/drivers/pci/hotplug/acpiphp_glue.c 2003-07-02 16:45:06.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/hotplug/acpiphp_glue.c 2003-07-03 15:55:17.000000000 -0400 @@ -607,7 +607,7 @@ /* check if this bridge has ejectable slots */ if (detect_ejectable_slots(handle) > 0) { - dbg("found PCI-to-PCI bridge at PCI %s\n", dev->slot_name); + dbg("found PCI-to-PCI bridge at PCI %s\n", pci_name(dev)); add_p2p_bridge(handle, seg, bus, device, function); } @@ -693,7 +693,7 @@ if (func->flags & FUNC_HAS_PS0) { dbg("%s: executing _PS0 on %s\n", __FUNCTION__, - func->pci_dev->slot_name); + pci_name(func->pci_dev)); status = acpi_evaluate_object(func->handle, "_PS0", NULL, NULL); if (ACPI_FAILURE(status)) { warn("%s: _PS0 failed\n", __FUNCTION__); diff -ur linux-2.5.74/drivers/pci/hotplug/acpiphp_pci.c linux-2.5.74-zee-pci_name/drivers/pci/hotplug/acpiphp_pci.c --- linux-2.5.74/drivers/pci/hotplug/acpiphp_pci.c 2003-07-02 16:39:13.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/hotplug/acpiphp_pci.c 2003-07-03 15:53:40.000000000 -0400 @@ -212,7 +212,7 @@ int count; struct pci_resource *res; - dbg("Device %s\n", dev->slot_name); + dbg("Device %s\n", pci_name(dev)); for (count = 0; address[count]; count++) { /* for 6 BARs */ pci_read_config_dword(dev, address[count], &bar); @@ -337,7 +337,7 @@ struct pci_dev *dev; dev = func->pci_dev; - dbg("Hot-pluggable device %s\n", dev->slot_name); + dbg("Hot-pluggable device %s\n", pci_name(dev)); for (count = 0; address[count]; count++) { /* for 6 BARs */ pci_read_config_dword(dev, address[count], &bar); diff -ur linux-2.5.74/drivers/pci/hotplug.c linux-2.5.74-zee-pci_name/drivers/pci/hotplug.c --- linux-2.5.74/drivers/pci/hotplug.c 2003-07-02 16:55:56.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/hotplug.c 2003-07-03 16:02:23.000000000 -0400 @@ -57,7 +57,7 @@ envp[i++] = scratch; length += snprintf (scratch, buffer_size - length, "PCI_SLOT_NAME=%s", - pdev->slot_name); + pci_name(pdev)); if ((buffer_size - length <= 0) || (i >= num_envp)) return -ENOMEM; diff -ur linux-2.5.74/drivers/pci/pci.c linux-2.5.74-zee-pci_name/drivers/pci/pci.c --- linux-2.5.74/drivers/pci/pci.c 2003-07-02 16:43:56.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/pci.c 2003-07-03 15:59:52.000000000 -0400 @@ -506,7 +506,7 @@ pci_resource_flags(pdev, bar) & IORESOURCE_IO ? "I/O" : "mem", bar + 1, /* PCI BAR # */ pci_resource_len(pdev, bar), pci_resource_start(pdev, bar), - pdev->slot_name); + pci_name(pdev)); return -EBUSY; } @@ -555,7 +555,7 @@ pci_resource_flags(pdev, i) & IORESOURCE_IO ? "I/O" : "mem", i + 1, /* PCI BAR # */ pci_resource_len(pdev, i), pci_resource_start(pdev, i), - pdev->slot_name); + pci_name(pdev)); while(--i >= 0) pci_release_region(pdev, i); @@ -576,7 +576,7 @@ pci_read_config_word(dev, PCI_COMMAND, &cmd); if (! (cmd & PCI_COMMAND_MASTER)) { - DBG("PCI: Enabling bus mastering for device %s\n", dev->slot_name); + DBG("PCI: Enabling bus mastering for device %s\n", pci_name(dev)); cmd |= PCI_COMMAND_MASTER; pci_write_config_word(dev, PCI_COMMAND, cmd); } @@ -620,7 +620,7 @@ return 0; printk(KERN_WARNING "PCI: cache line size of %d is not supported " - "by device %s\n", pci_cache_line_size << 2, dev->slot_name); + "by device %s\n", pci_cache_line_size << 2, pci_name(dev)); return -EINVAL; } @@ -653,7 +653,7 @@ pci_read_config_word(dev, PCI_COMMAND, &cmd); if (! (cmd & PCI_COMMAND_INVALIDATE)) { - DBG("PCI: Enabling Mem-Wr-Inval for device %s\n", dev->slot_name); + DBG("PCI: Enabling Mem-Wr-Inval for device %s\n", pci_name(dev)); cmd |= PCI_COMMAND_INVALIDATE; pci_write_config_word(dev, PCI_COMMAND, cmd); } diff -ur linux-2.5.74/drivers/pci/pool.c linux-2.5.74-zee-pci_name/drivers/pci/pool.c --- linux-2.5.74/drivers/pci/pool.c 2003-07-02 16:56:03.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/pool.c 2003-07-03 16:03:18.000000000 -0400 @@ -233,7 +233,7 @@ struct pci_page, page_list); if (is_page_busy (pool->blocks_per_page, page->bitmap)) { printk (KERN_ERR "pci_pool_destroy %s/%s, %p busy\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, page->vaddr); /* leak the still-in-use consistent memory */ list_del (&page->page_list); @@ -359,7 +359,7 @@ if ((page = pool_find_page (pool, dma)) == 0) { printk (KERN_ERR "pci_pool_free %s/%s, %p/%lx (bad dma)\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, vaddr, (unsigned long) dma); return; } @@ -372,13 +372,13 @@ #ifdef CONFIG_DEBUG_SLAB if (((dma - page->dma) + (void *)page->vaddr) != vaddr) { printk (KERN_ERR "pci_pool_free %s/%s, %p (bad vaddr)/%Lx\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, vaddr, (unsigned long long) dma); return; } if (page->bitmap [map] & (1UL << block)) { printk (KERN_ERR "pci_pool_free %s/%s, dma %Lx already free\n", - pool->dev ? pool->dev->slot_name : NULL, + pool->dev ? pci_name(pool->dev) : NULL, pool->name, (unsigned long long)dma); return; } diff -ur linux-2.5.74/drivers/pci/probe.c linux-2.5.74-zee-pci_name/drivers/pci/probe.c --- linux-2.5.74/drivers/pci/probe.c 2003-07-02 16:51:13.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/probe.c 2003-07-03 16:00:36.000000000 -0400 @@ -403,7 +403,6 @@ { u32 class; - dev->slot_name = dev->dev.bus_id; sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(dev->bus), dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); sprintf(dev->dev.name, "PCI device %04x:%04x", diff -ur linux-2.5.74/drivers/pci/quirks.c linux-2.5.74-zee-pci_name/drivers/pci/quirks.c --- linux-2.5.74/drivers/pci/quirks.c 2003-07-02 16:40:14.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/quirks.c 2003-07-03 15:57:52.000000000 -0400 @@ -33,7 +33,7 @@ while ((d = pci_find_device(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371SB_0, d))) { pci_read_config_byte(d, 0x82, &dlc); if (!(dlc & 1<<1)) { - printk(KERN_ERR "PCI: PIIX3: Enabling Passive Release on %s\n", d->slot_name); + printk(KERN_ERR "PCI: PIIX3: Enabling Passive Release on %s\n", pci_name(d)); dlc |= 1<<1; pci_write_config_byte(d, 0x82, dlc); } @@ -437,7 +437,7 @@ if (new_irq != irq) { printk(KERN_INFO "PCI: Via IRQ fixup for %s, from %d to %d\n", - dev->slot_name, irq, new_irq); + pci_name(dev), irq, new_irq); udelay(15); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, new_irq); @@ -598,7 +598,7 @@ return; printk(KERN_INFO "PCI: Ignoring BAR%d-%d of IDE controller %s\n", - first_bar, last_bar, dev->slot_name); + first_bar, last_bar, pci_name(dev)); } /* @@ -856,7 +856,7 @@ (f->vendor == dev->vendor || f->vendor == (u16) PCI_ANY_ID) && (f->device == dev->device || f->device == (u16) PCI_ANY_ID)) { #ifdef DEBUG - printk(KERN_INFO "PCI: Calling quirk %p for %s\n", f->hook, dev->slot_name); + printk(KERN_INFO "PCI: Calling quirk %p for %s\n", f->hook, pci_name(dev)); #endif f->hook(dev); } diff -ur linux-2.5.74/drivers/pci/setup-bus.c linux-2.5.74-zee-pci_name/drivers/pci/setup-bus.c --- linux-2.5.74/drivers/pci/setup-bus.c 2003-07-02 16:57:17.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/setup-bus.c 2003-07-03 16:04:20.000000000 -0400 @@ -81,7 +81,7 @@ struct pci_bus_region region; printk("PCI: Bus %d, cardbus bridge: %s\n", - bus->number, bridge->slot_name); + bus->number, pci_name(bridge)); pcibios_resource_to_bus(bridge, ®ion, bus->resource[0]); if (bus->resource[0]->flags & IORESOURCE_IO) { @@ -344,7 +344,7 @@ if (order > 11) { printk(KERN_WARNING "PCI: region %s/%d " "too large: %lx-%lx\n", - dev->slot_name, i, r->start, r->end); + pci_name(dev), i, r->start, r->end); r->flags = 0; continue; } @@ -513,7 +513,7 @@ default: printk(KERN_INFO "PCI: not setting up bridge %s " - "for bus %d\n", dev->slot_name, b->number); + "for bus %d\n", pci_name(dev), b->number); break; } } diff -ur linux-2.5.74/drivers/pci/setup-res.c linux-2.5.74-zee-pci_name/drivers/pci/setup-res.c --- linux-2.5.74/drivers/pci/setup-res.c 2003-07-02 16:54:38.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pci/setup-res.c 2003-07-03 16:01:37.000000000 -0400 @@ -68,7 +68,7 @@ if ((new ^ check) & mask) { printk(KERN_ERR "PCI: Error while updating region " - "%s/%d (%08x != %08x)\n", dev->slot_name, resno, + "%s/%d (%08x != %08x)\n", pci_name(dev), resno, new, check); } @@ -80,7 +80,7 @@ if (check != new) { printk(KERN_ERR "PCI: Error updating region " "%s/%d (high %08x != %08x)\n", - dev->slot_name, resno, new, check); + pci_name(dev), resno, new, check); } } } @@ -101,7 +101,7 @@ printk(KERN_ERR "PCI: %s region %d of %s %s [%lx:%lx]\n", root ? "Address space collision on" : "No parent found for", - resource, dtype, dev->slot_name, res->start, res->end); + resource, dtype, pci_name(dev), res->start, res->end); } return err; @@ -139,7 +139,7 @@ if (ret) { printk(KERN_ERR "PCI: Failed to allocate resource %d(%lx-%lx) for %s\n", - resno, res->start, res->end, dev->slot_name); + resno, res->start, res->end, pci_name(dev)); } else if (resno < PCI_BRIDGE_RESOURCES) { pci_update_resource(dev, res, resno); } diff -ur linux-2.5.74/drivers/pcmcia/yenta_socket.c linux-2.5.74-zee-pci_name/drivers/pcmcia/yenta_socket.c --- linux-2.5.74/drivers/pcmcia/yenta_socket.c 2003-07-02 16:49:32.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/pcmcia/yenta_socket.c 2003-07-03 19:23:24.000000000 -0400 @@ -655,7 +655,7 @@ if (request_resource(root, res) == 0) return; printk(KERN_INFO "yenta %s: Preassigned resource %d busy, reconfiguring...\n", - socket->dev->slot_name, nr); + pci_name(socket->dev), nr); res->start = res->end = 0; } @@ -695,7 +695,7 @@ align = size; } while (size >= min); printk(KERN_INFO "yenta %s: no resource of type %x available, trying to continue...\n", - socket->dev->slot_name, type); + pci_name(socket->dev), type); res->start = res->end = 0; } diff -ur linux-2.5.74/drivers/scsi/ips.h linux-2.5.74-zee-pci_name/drivers/scsi/ips.h --- linux-2.5.74/drivers/scsi/ips.h 2003-07-02 16:43:34.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/scsi/ips.h 2003-07-03 19:17:34.000000000 -0400 @@ -107,7 +107,7 @@ #define IPS_SCSI_SET_DEVICE(sh,ha) scsi_set_pci_device(sh, (ha)->pcidev) #define IPS_PRINTK(level, pcidev, format, arg...) \ printk(level "%s %s:" format , (pcidev)->driver->name , \ - (pcidev)->slot_name , ## arg) + pci_name(pcidev) , ## arg) #else #define IPS_REGISTER_HOSTS(SHT) (!ips_detect(SHT)) #define IPS_UNREGISTER_HOSTS(SHT) diff -ur linux-2.5.74/drivers/scsi/nsp32.c linux-2.5.74-zee-pci_name/drivers/scsi/nsp32.c --- linux-2.5.74/drivers/scsi/nsp32.c 2003-07-02 16:46:01.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/scsi/nsp32.c 2003-07-03 19:18:14.000000000 -0400 @@ -1976,7 +1976,7 @@ ret = nsp32_detect(pdev); nsp32_msg(KERN_INFO, "nsp32 irq: %i mmio: 0x%lx slot: %s model: %s", - pdev->irq, data->MmioAddress, pdev->slot_name, + pdev->irq, data->MmioAddress, pci_name(pdev), nsp32_model[id->driver_data]); nsp32_dbg(NSP32_DEBUG_REGISTER, "exit"); diff -ur linux-2.5.74/drivers/serial/8250_pci.c linux-2.5.74-zee-pci_name/drivers/serial/8250_pci.c --- linux-2.5.74/drivers/serial/8250_pci.c 2003-07-02 16:52:51.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/serial/8250_pci.c 2003-07-03 19:16:48.000000000 -0400 @@ -103,7 +103,7 @@ KERN_WARNING "message (0x%04x,0x%04x,0x%04x,0x%04x), the\n" KERN_WARNING "manufacturer and name of serial board or\n" KERN_WARNING "modem board to rmk+serial@arm.linux.org.uk.\n", - dev->slot_name, str, dev->vendor, dev->device, + pci_name(dev), str, dev->vendor, dev->device, dev->subsystem_vendor, dev->subsystem_device); } diff -ur linux-2.5.74/drivers/usb/core/hcd-pci.c linux-2.5.74-zee-pci_name/drivers/usb/core/hcd-pci.c --- linux-2.5.74/drivers/usb/core/hcd-pci.c 2003-07-02 16:47:26.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/usb/core/hcd-pci.c 2003-07-03 19:20:41.000000000 -0400 @@ -81,7 +81,7 @@ if (!dev->irq) { err ("Found HC with no IRQ. Check BIOS/PCI %s setup!", - dev->slot_name); + pci_name(dev)); return -ENODEV; } @@ -99,7 +99,7 @@ retval = -EFAULT; clean_1: release_mem_region (resource, len); - err ("init %s fail, %d", dev->slot_name, retval); + err ("init %s fail, %d", pci_name(dev), retval); return retval; } @@ -136,7 +136,7 @@ goto clean_1; } else { release_region (resource, len); - err ("init %s fail, %d", dev->slot_name, retval); + err ("init %s fail, %d", pci_name(dev), retval); return retval; } } @@ -144,7 +144,7 @@ hcd->driver = driver; hcd->description = driver->description; hcd->pdev = dev; - hcd->self.bus_name = dev->slot_name; + hcd->self.bus_name = pci_name(dev); hcd->product_desc = dev->dev.name; hcd->self.controller = &dev->dev; hcd->controller = hcd->self.controller; diff -ur linux-2.5.74/drivers/usb/gadget/net2280.c linux-2.5.74-zee-pci_name/drivers/usb/gadget/net2280.c --- linux-2.5.74/drivers/usb/gadget/net2280.c 2003-07-02 16:40:59.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/usb/gadget/net2280.c 2003-07-03 19:21:44.000000000 -0400 @@ -2496,7 +2496,7 @@ device_remove_file (&pdev->dev, &dev_attr_registers); pci_set_drvdata (pdev, 0); - INFO (dev, "unbind from pci %s\n", pdev->slot_name); + INFO (dev, "unbind from pci %s\n", pci_name(pdev)); kfree (dev); the_controller = 0; @@ -2518,7 +2518,7 @@ * usb_gadget_driver_{register,unregister}() must change. */ if (the_controller) { - WARN (the_controller, "ignoring %s\n", pdev->slot_name); + WARN (the_controller, "ignoring %s\n", pci_name(pdev)); return -EBUSY; } @@ -2534,7 +2534,7 @@ dev->pdev = pdev; dev->gadget.ops = &net2280_ops; - strcpy (dev->gadget.dev.bus_id, pdev->slot_name); + strcpy (dev->gadget.dev.bus_id, pci_name(pdev)); strcpy (dev->gadget.dev.name, pdev->dev.name); dev->gadget.dev.parent = &pdev->dev; dev->gadget.dev.dma_mask = pdev->dev.dma_mask; diff -ur linux-2.5.74/drivers/usb/gadget/net2280.h linux-2.5.74-zee-pci_name/drivers/usb/gadget/net2280.h --- linux-2.5.74/drivers/usb/gadget/net2280.h 2003-07-02 16:51:55.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/usb/gadget/net2280.h 2003-07-03 19:22:28.000000000 -0400 @@ -654,7 +654,7 @@ #define xprintk(dev,level,fmt,args...) \ printk(level "%s %s: " fmt , driver_name , \ - dev->pdev->slot_name , ## args) + pci_name(dev->pdev) , ## args) #ifdef DEBUG #undef DEBUG diff -ur linux-2.5.74/drivers/video/matrox/matroxfb_base.c linux-2.5.74-zee-pci_name/drivers/video/matrox/matroxfb_base.c --- linux-2.5.74/drivers/video/matrox/matroxfb_base.c 2003-07-02 16:51:02.000000000 -0400 +++ linux-2.5.74-zee-pci_name/drivers/video/matrox/matroxfb_base.c 2003-07-03 17:55:17.000000000 -0400 @@ -1070,7 +1070,7 @@ memset(&r, 0, sizeof(r)); strcpy(r.driver, "matroxfb"); strcpy(r.card, "Matrox"); - sprintf(r.bus_info, "PCI:%s", ACCESS_FBINFO(pcidev)->slot_name); + sprintf(r.bus_info, "PCI:%s", pci_name(ACCESS_FBINFO(pcidev))); r.version = KERNEL_VERSION(1,0,0); r.capabilities = V4L2_CAP_VIDEO_OUTPUT; if (copy_to_user((void*)arg, &r, sizeof(r))) diff -ur linux-2.5.74/include/linux/ethtool.h linux-2.5.74-zee-pci_name/include/linux/ethtool.h --- linux-2.5.74/include/linux/ethtool.h 2003-07-02 16:43:41.000000000 -0400 +++ linux-2.5.74-zee-pci_name/include/linux/ethtool.h 2003-07-03 19:29:52.000000000 -0400 @@ -37,7 +37,7 @@ char version[32]; /* driver version string */ char fw_version[32]; /* firmware version string, if applicable */ char bus_info[ETHTOOL_BUSINFO_LEN]; /* Bus info for this IF. */ - /* For PCI devices, use pci_dev->slot_name. */ + /* For PCI devices, use pci_name(pci_dev). */ char reserved1[32]; char reserved2[16]; u32 n_stats; /* number of u64's from ETHTOOL_GSTATS */ diff -ur linux-2.5.74/include/linux/videodev2.h linux-2.5.74-zee-pci_name/include/linux/videodev2.h --- linux-2.5.74/include/linux/videodev2.h 2003-07-02 16:50:22.000000000 -0400 +++ linux-2.5.74-zee-pci_name/include/linux/videodev2.h 2003-07-03 19:30:43.000000000 -0400 @@ -130,7 +130,7 @@ { __u8 driver[16]; /* i.e. "bttv" */ __u8 card[32]; /* i.e. "Hauppauge WinTV" */ - __u8 bus_info[32]; /* "PCI:" + pci_dev->slot_name */ + __u8 bus_info[32]; /* "PCI:" + pci_name(pci_dev) */ __u32 version; /* should use KERNEL_VERSION() */ __u32 capabilities; /* Device capabilities */ __u32 reserved[4]; diff -ur linux-2.5.74/sound/oss/emu10k1/main.c linux-2.5.74-zee-pci_name/sound/oss/emu10k1/main.c --- linux-2.5.74/sound/oss/emu10k1/main.c 2003-07-02 16:57:15.000000000 -0400 +++ linux-2.5.74-zee-pci_name/sound/oss/emu10k1/main.c 2003-07-03 19:32:13.000000000 -0400 @@ -256,13 +256,13 @@ goto err_out; } - sprintf(s, "driver/emu10k1/%s", card->pci_dev->slot_name); + sprintf(s, "driver/emu10k1/%s", pci_name(card->pci_dev)); if (!proc_mkdir (s, 0)) { printk(KERN_ERR "emu10k1: unable to create proc directory %s\n", s); goto err_emu10k1_proc; } - sprintf(s, "driver/emu10k1/%s/ac97", card->pci_dev->slot_name); + sprintf(s, "driver/emu10k1/%s/ac97", pci_name(card->pci_dev)); if (!create_proc_read_entry (s, 0, 0, ac97_read_proc, &card->ac97)) { printk(KERN_ERR "emu10k1: unable to create proc entry %s\n", s); goto err_ac97_proc; @@ -276,7 +276,7 @@ return 0; err_ac97_proc: - sprintf(s, "driver/emu10k1/%s", card->pci_dev->slot_name); + sprintf(s, "driver/emu10k1/%s", pci_name(card->pci_dev)); remove_proc_entry(s, NULL); err_emu10k1_proc: @@ -291,10 +291,10 @@ char s[32]; if (!card->is_aps) { - sprintf(s, "driver/emu10k1/%s/ac97", card->pci_dev->slot_name); + sprintf(s, "driver/emu10k1/%s/ac97", pci_name(card->pci_dev)); remove_proc_entry(s, NULL); - sprintf(s, "driver/emu10k1/%s", card->pci_dev->slot_name); + sprintf(s, "driver/emu10k1/%s", pci_name(card->pci_dev)); remove_proc_entry(s, NULL); remove_proc_entry("driver/emu10k1", NULL);