From 1c113a7e0f005c19df1852ae0c9a80ca6a33d38f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 14 Jul 2003 02:33:07 -0700 Subject: [PATCH] PCI: remove usages of pci slot_name from the pci core code. --- drivers/pci/hotplug.c | 2 +- drivers/pci/pci.c | 10 +++++----- drivers/pci/pool.c | 8 ++++---- drivers/pci/quirks.c | 8 ++++---- drivers/pci/setup-bus.c | 6 +++--- drivers/pci/setup-res.c | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c index 168ae7ef4dc4..872989de3807 100644 --- a/drivers/pci/hotplug.c +++ b/drivers/pci/hotplug.c @@ -57,7 +57,7 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp, 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 --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 4e737eaa7469..2624b027c4c6 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -506,7 +506,7 @@ err_out: 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 @@ err_out: 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_set_master(struct pci_dev *dev) 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 @@ pci_generic_prep_mwi(struct pci_dev *dev) 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_set_mwi(struct pci_dev *dev) 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 --git a/drivers/pci/pool.c b/drivers/pci/pool.c index 3b0ea54497a6..baffc52d89d3 100644 --- a/drivers/pci/pool.c +++ b/drivers/pci/pool.c @@ -233,7 +233,7 @@ pci_pool_destroy (struct pci_pool *pool) 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 @@ pci_pool_free (struct pci_pool *pool, void *vaddr, dma_addr_t dma) 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 @@ pci_pool_free (struct pci_pool *pool, void *vaddr, dma_addr_t dma) #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 --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 7bfbb30f94dc..6df1f1c7711b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -33,7 +33,7 @@ static void __devinit quirk_passive_release(struct pci_dev *dev) 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 @@ static void __devinit quirk_via_irqpic(struct pci_dev *dev) 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 @@ static void __devinit quirk_ide_bases(struct pci_dev *dev) 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 @@ static void pci_do_fixups(struct pci_dev *dev, int pass, struct pci_fixup *f) (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 --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 653176f2d20f..58d96d111429 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -81,7 +81,7 @@ pci_setup_cardbus(struct pci_bus *bus) 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 @@ pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long type) 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 @@ pci_bus_assign_resources(struct pci_bus *bus) 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 --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 93238208b822..338621627636 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -68,7 +68,7 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) 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 @@ pci_update_resource(struct pci_dev *dev, struct resource *res, int resno) 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 @@ pci_claim_resource(struct pci_dev *dev, int resource) 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 @@ int pci_assign_resource(struct pci_dev *dev, int resno) 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); } -- cgit v1.2.3