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

diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index c5b58f01a79054d6169eb7fa53581fc0254269da..561122beae58e548c709862f2767e7110782a83c 100644 (file)
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -33,13 +33,6 @@
 # error NR_IRQS < MARVEL_NR_IRQS !!!
 #endif
 
-/* ??? Should probably be generic.  */
-#ifdef CONFIG_PCI_NAMES
-#define pci_pretty_name(x) ((x)->pretty_name)
-#else
-#define pci_pretty_name(x) ""
-#endif
-
 \f
 /*
  * Interrupt handling.

diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 6e97e0daa765ba7d8b336dcad9eb0b404d3f6bb2..6842d58234654186f20792a06690276eae32f3d4 100644 (file)
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -31,12 +31,6 @@
 #include <asm/kdebug.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;
 
 unsigned long iommu_bus_base;  /* GART remapping area (physical) */

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 287f8ebc4bf2cbdea85131310d2d363b1a446a6d..3c4fc6c627732c2a6fbaafc848e43ba2a75954f7 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -842,6 +842,13 @@ static inline char *pci_name(struct pci_dev *pdev)
        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.
  *  For at least a part of these bugs we need a work-around, so both