[PATCH -v2 03/16] PCI: IA64: convert pcibios_set_master() to anon-inlined function

From: Myron Stowe
Date: Fri Oct 28 2011 - 17:48:30 EST

From: Myron Stowe <mstowe@xxxxxxxxxx>

This patch converts IA64's architecture-specific 'pcibios_set_master()'
routine to a non-inlined function. This will allow follow on
patches to create a generic 'pcibios_set_master()' function using the
'__weak' attribute which can be used by all architectures as a default
which, if necessary, can then be over-ridden by architecture-
specific code.

Converting 'pci_bios_set_master()' to a non-inlined function will allow
IA64's 'pcibios_set_master()' implementation to remain architecture-
specific after the generic version is introduced and thus, not change
current behavior.

No functional change.

Signed-off-by: Myron Stowe <myron.stowe@xxxxxxxxxx>

arch/ia64/include/asm/pci.h | 6 ------
arch/ia64/pci/pci.c | 5 +++++
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/ia64/include/asm/pci.h b/arch/ia64/include/asm/pci.h
index 73b5f78..6e3d91e 100644
--- a/arch/ia64/include/asm/pci.h
+++ b/arch/ia64/include/asm/pci.h
@@ -43,12 +43,6 @@ extern unsigned long ia64_max_iommu_merge_mask;
#define PCI_DMA_BUS_IS_PHYS (ia64_max_iommu_merge_mask == ~0UL)

static inline void
-pcibios_set_master (struct pci_dev *dev)
- /* No special bus mastering setup handling */
-static inline void
pcibios_penalize_isa_irq (int irq, int active)
/* We don't do dynamic PCI IRQ allocation */
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index aa2533a..8273acb 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -513,6 +513,11 @@ pcibios_fixup_bus (struct pci_bus *b)

+void pcibios_set_master (struct pci_dev *dev)
+ /* No special bus mastering setup handling */
void __devinit
pcibios_update_irq (struct pci_dev *dev, int irq)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/