diff options
| author | Myron Stowe <mstowe@redhat.com> | 2011-10-28 15:47:49 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 12:10:37 -0800 |
| commit | 91e86df1a08875bbba9d00d33dc3098f4fd95d4d (patch) | |
| tree | 10ed76aa876a710ea88d96adb6b71311e0d0efa0 | |
| parent | 168c8619fd825d80d1753bf298d0b6aa8d739623 (diff) | |
| download | linux-3.10-91e86df1a08875bbba9d00d33dc3098f4fd95d4d.tar.gz linux-3.10-91e86df1a08875bbba9d00d33dc3098f4fd95d4d.tar.bz2 linux-3.10-91e86df1a08875bbba9d00d33dc3098f4fd95d4d.zip | |
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>
| -rw-r--r-- | arch/ia64/include/asm/pci.h | 6 | ||||
| -rw-r--r-- | 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 127dd7be346..279b38ae74a 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 2c27714d7b7..99f232c50bd 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c @@ -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) { |