Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Myron Stowe and committed by
Jesse Barnes
9cdce18d b73224fd

+5 -5
-5
arch/xtensa/include/asm/pci.h
··· 22 22 23 23 extern struct pci_controller* pcibios_alloc_controller(void); 24 24 25 - static inline void pcibios_set_master(struct pci_dev *dev) 26 - { 27 - /* No special bus mastering setup handling */ 28 - } 29 - 30 25 static inline void pcibios_penalize_isa_irq(int irq) 31 26 { 32 27 /* We don't do dynamic PCI IRQ allocation */
+5
arch/xtensa/kernel/pci.c
··· 227 227 return str; 228 228 } 229 229 230 + void pcibios_set_master(struct pci_dev *dev) 231 + { 232 + /* No special bus mastering setup handling */ 233 + } 234 + 230 235 /* the next one is stolen from the alpha port... */ 231 236 232 237 void __init