diff options
| author | Myron Stowe <mstowe@redhat.com> | 2011-10-28 15:48:31 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 12:10:41 -0800 |
| commit | 9cdce18d6f0baae53f012fb3f50e66e7ff24c509 (patch) | |
| tree | 49dd1813f1f5ac0b604a2b23530d2d3f57cfb65f | |
| parent | b73224fdcf273956ee52c5c0975ee400231f6cdb (diff) | |
| download | linux-9cdce18d6f0baae53f012fb3f50e66e7ff24c509.tar.gz linux-9cdce18d6f0baae53f012fb3f50e66e7ff24c509.tar.bz2 linux-9cdce18d6f0baae53f012fb3f50e66e7ff24c509.zip | |
PCI: Xtensa: convert pcibios_set_master() to a non-inlined function
This patch converts Xtensa'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 Xtensa'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/xtensa/include/asm/pci.h | 5 | ||||
| -rw-r--r-- | arch/xtensa/kernel/pci.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h index 4609b0f15f1f..05244f07dd31 100644 --- a/arch/xtensa/include/asm/pci.h +++ b/arch/xtensa/include/asm/pci.h @@ -22,11 +22,6 @@ extern struct pci_controller* pcibios_alloc_controller(void); -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) { /* We don't do dynamic PCI IRQ allocation */ diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c index cd1026931203..644b2d4b299d 100644 --- a/arch/xtensa/kernel/pci.c +++ b/arch/xtensa/kernel/pci.c @@ -227,6 +227,11 @@ char __init *pcibios_setup(char *str) return str; } +void pcibios_set_master(struct pci_dev *dev) +{ + /* No special bus mastering setup handling */ +} + /* the next one is stolen from the alpha port... */ void __init |