Commit 91e86df1 authored Oct 28, 2011 by Myron Stowe Committed by Jesse Barnes Jan 06, 2012

PCI: IA64: convert pcibios_set_master() to a non-inlined function



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@redhat.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 168c8619

arch/ia64/include/asm/pci.h

+0 −6

Original line number	Diff line number	Diff line
		@@ -42,12 +42,6 @@ struct pci_dev;
		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)
		{

arch/ia64/pci/pci.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -514,6 +514,11 @@ pcibios_fixup_bus (struct pci_bus *b)
		return;
		}

		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)
		{