aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/proc.c')
-rw-r--r--drivers/pci/proc.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 7988fc8df3fd..9613f666c110 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -474,7 +474,7 @@ static int show_dev_config(struct seq_file *m, void *v)
474 struct pci_dev *first_dev; 474 struct pci_dev *first_dev;
475 struct pci_driver *drv; 475 struct pci_driver *drv;
476 u32 class_rev; 476 u32 class_rev;
477 unsigned char latency, min_gnt, max_lat, *class; 477 unsigned char latency, min_gnt, max_lat;
478 int reg; 478 int reg;
479 479
480 first_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL); 480 first_dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, NULL);
@@ -490,16 +490,8 @@ static int show_dev_config(struct seq_file *m, void *v)
490 pci_read_config_byte (dev, PCI_MAX_LAT, &max_lat); 490 pci_read_config_byte (dev, PCI_MAX_LAT, &max_lat);
491 seq_printf(m, " Bus %2d, device %3d, function %2d:\n", 491 seq_printf(m, " Bus %2d, device %3d, function %2d:\n",
492 dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn)); 492 dev->bus->number, PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
493 class = pci_class_name(class_rev >> 16); 493 seq_printf(m, " Class %04x", class_rev >> 16);
494 if (class)
495 seq_printf(m, " %s", class);
496 else
497 seq_printf(m, " Class %04x", class_rev >> 16);
498#ifdef CONFIG_PCI_NAMES
499 seq_printf(m, ": %s", dev->pretty_name);
500#else
501 seq_printf(m, ": PCI device %04x:%04x", dev->vendor, dev->device); 494 seq_printf(m, ": PCI device %04x:%04x", dev->vendor, dev->device);
502#endif
503 seq_printf(m, " (rev %d).\n", class_rev & 0xff); 495 seq_printf(m, " (rev %d).\n", class_rev & 0xff);
504 496
505 if (dev->irq) 497 if (dev->irq)