Commit c8480a18 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

PCI: added the pci_pretty_name() macro to pci.h as 2 arches already had it.

parent de9af88e
...@@ -33,13 +33,6 @@ ...@@ -33,13 +33,6 @@
# error NR_IRQS < MARVEL_NR_IRQS !!! # error NR_IRQS < MARVEL_NR_IRQS !!!
#endif #endif
/* ??? Should probably be generic. */
#ifdef CONFIG_PCI_NAMES
#define pci_pretty_name(x) ((x)->pretty_name)
#else
#define pci_pretty_name(x) ""
#endif
/* /*
* Interrupt handling. * Interrupt handling.
......
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
#include <asm/kdebug.h> #include <asm/kdebug.h>
#include <asm/proto.h> #include <asm/proto.h>
#ifdef CONFIG_PCI_NAMES
#define pci_pretty_name(dev) ((dev)->pretty_name)
#else
#define pci_pretty_name(dev) ""
#endif
dma_addr_t bad_dma_address; dma_addr_t bad_dma_address;
unsigned long iommu_bus_base; /* GART remapping area (physical) */ unsigned long iommu_bus_base; /* GART remapping area (physical) */
......
...@@ -842,6 +842,13 @@ static inline char *pci_name(struct pci_dev *pdev) ...@@ -842,6 +842,13 @@ static inline char *pci_name(struct pci_dev *pdev)
return pdev->dev.bus_id; return pdev->dev.bus_id;
} }
/* Some archs want to see the pretty pci name, so use this macro */
#ifdef CONFIG_PCI_NAMES
#define pci_pretty_name(dev) ((dev)->pretty_name)
#else
#define pci_pretty_name(dev) ""
#endif
/* /*
* The world is not perfect and supplies us with broken PCI devices. * The world is not perfect and supplies us with broken PCI devices.
* For at least a part of these bugs we need a work-around, so both * For at least a part of these bugs we need a work-around, so both
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment