From 806669fc1a4cfe0930a51e314a728fe086d75547 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 6 Aug 2003 01:41:22 -0700 Subject: [PATCH] [PATCH] PCI: remove all struct device.name usage from the PCI core code. This is because that field is going away shortly... --- drivers/pci/names.c | 2 +- drivers/pci/probe.c | 9 +++------ drivers/pci/proc.c | 7 ++++++- drivers/pci/quirks.c | 2 +- drivers/pci/setup-bus.c | 2 +- drivers/pci/setup-res.c | 2 +- include/linux/pci.h | 3 +++ 7 files changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/pci/names.c b/drivers/pci/names.c index 9e9f97c296e24..121ad4b523197 100644 --- a/drivers/pci/names.c +++ b/drivers/pci/names.c @@ -56,7 +56,7 @@ void __devinit pci_name_device(struct pci_dev *dev) { const struct pci_vendor_info *vendor_p = pci_vendor_list; int i = VENDORS; - char *name = dev->dev.name; + char *name = dev->pretty_name; do { if (vendor_p->vendor == dev->vendor) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ccd50ca202f84..e510805de7a67 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -69,7 +69,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) for(pos=0; posresource[pos]; - res->name = dev->dev.name; + res->name = pci_name(dev); reg = PCI_BASE_ADDRESS_0 + (pos << 2); pci_read_config_dword(dev, reg, &l); pci_write_config_dword(dev, reg, ~0); @@ -120,7 +120,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom) if (rom) { dev->rom_base_reg = rom; res = &dev->resource[PCI_ROM_RESOURCE]; - res->name = dev->dev.name; + res->name = pci_name(dev); pci_read_config_dword(dev, rom, &l); pci_write_config_dword(dev, rom, ~PCI_ROM_ADDRESS_ENABLE); pci_read_config_dword(dev, rom, &sz); @@ -153,7 +153,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) return; if (dev->transparent) { - printk("Transparent bridge - %s\n", dev->dev.name); + printk("Transparent bridge - %s\n", pci_name(dev)); for(i = 0; i < PCI_BUS_NUM_RESOURCES; i++) child->resource[i] = child->parent->resource[i]; return; @@ -406,8 +406,6 @@ static int pci_setup_device(struct pci_dev * dev) 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", - dev->vendor, dev->device); INIT_LIST_HEAD(&dev->pools); @@ -663,7 +661,6 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, memset(b->dev,0,sizeof(*(b->dev))); b->dev->parent = parent; sprintf(b->dev->bus_id,"pci%04x:%02x", pci_domain_nr(b), bus); - strcpy(b->dev->name,"Host/PCI Bridge"); device_register(b->dev); b->number = b->secondary = bus; diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index e576e7a62a13c..3518812d6e311 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -483,7 +483,12 @@ static int show_dev_config(struct seq_file *m, void *v) seq_printf(m, " %s", class); else seq_printf(m, " Class %04x", class_rev >> 16); - seq_printf(m, ": %s (rev %d).\n", dev->dev.name, class_rev & 0xff); +#ifdef CONFIG_PCI_NAMES + seq_printf(m, ": %s", dev->pretty_name); +#else + seq_printf(m, ": PCI device %04x:%04x", dev->vendor, dev->device); +#endif + seq_printf(m, " (rev %d).\n", class_rev & 0xff); if (dev->irq) seq_printf(m, " IRQ %d.\n", dev->irq); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 6df1f1c7711bf..189ca6b6b2d70 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -219,7 +219,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, unsi if (region) { struct resource *res = dev->resource + nr; - res->name = dev->dev.name; + res->name = pci_name(dev); res->start = region; res->end = region + size - 1; res->flags = IORESOURCE_IO; diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 58d96d111429b..49d56aaea6522 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -141,7 +141,7 @@ pci_setup_bridge(struct pci_bus *bus) u32 l; DBGC((KERN_INFO "PCI: Bus %d, bridge: %s\n", - bus->number, bridge->dev.name)); + bus->number, pci_name(bridge))); /* Set up the top and bottom of the PCI I/O segment for this bus. */ pcibios_resource_to_bus(bridge, ®ion, bus->resource[0]); diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index 338621627636e..b26592680fda3 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -166,7 +166,7 @@ pdev_sort_resources(struct pci_dev *dev, struct resource_list *head) if (!r_align) { printk(KERN_WARNING "PCI: Ignore bogus resource %d " "[%lx:%lx] of %s\n", - i, r->start, r->end, dev->dev.name); + i, r->start, r->end, pci_name(dev)); continue; } r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start; diff --git a/include/linux/pci.h b/include/linux/pci.h index 89c42feef5be7..a4c7a4c7965e0 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -419,6 +419,9 @@ struct pci_dev { /* These fields are used by common fixups */ unsigned int transparent:1; /* Transparent PCI bridge */ unsigned int multifunction:1;/* Part of multi-function device */ +#ifdef CONFIG_PCI_NAMES + char pretty_name[DEVICE_NAME_SIZE]; /* pretty name for users to see */ +#endif }; #define pci_dev_g(n) list_entry(n, struct pci_dev, global_list) -- 2.53.0