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

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

This patch converts UniCore'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 UniCore'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
b73224fd cf1c5230

+5 -5
-5
arch/unicore32/include/asm/pci.h
··· 17 17 #include <asm-generic/pci.h> 18 18 #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ 19 19 20 - static inline void pcibios_set_master(struct pci_dev *dev) 21 - { 22 - /* No special bus mastering setup handling */ 23 - } 24 - 25 20 static inline void pcibios_penalize_isa_irq(int irq, int active) 26 21 { 27 22 /* We don't do dynamic PCI IRQ allocation */
+5
arch/unicore32/kernel/pci.c
··· 309 309 return str; 310 310 } 311 311 312 + void pcibios_set_master(struct pci_dev *dev) 313 + { 314 + /* No special bus mastering setup handling */ 315 + } 316 + 312 317 /* 313 318 * From arch/i386/kernel/pci-i386.c: 314 319 *