Re: [PATCH 06/10] x86/PCI: Enable scanning of all pci functions

Jeremy Fitzhardinge
2009-05-14T18:45:58Z

Jesse Barnes wrote:
> Anyway it's not a big deal, this code is already ugly (a 0 define for
> all arches? why?) so you shouldn't have to spend too much time
> cleaning it up.
>

OK, how's this as a delta (I can fold it into the previous patch if
you're OK with it):

Subject: [PATCH] pci: add HAVE_ARCH_PCIBIOS_SCAN_ALL_FNS

Jesse objected to the "#undef pcibios_scan_all_fns"'s ugliness,
so replace it with the more common HAVE_ARCH_ idiom.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 092706e..cabea93 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -134,8 +134,8 @@ extern void pci_iommu_alloc(void);
#include <asm-generic/pci-dma-compat.h>

/* generic pci stuff */
+#define HAVE_ARCH_PCIBIOS_SCAN_ALL_FNS
#include <asm-generic/pci.h>
-#undef pcibios_scan_all_fns

#ifdef CONFIG_NUMA
/* Returns the node based on pci bus */
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index c36a77d..9ad9cb7 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -43,7 +43,9 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res)
return root;
}

+#ifndef HAVE_ARCH_PCIBIOS_SCAN_ALL_FNS
#define pcibios_scan_all_fns(a, b) 0
+#endif

#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)

Thanks,
J