diff options
| author | Myron Stowe <mstowe@redhat.com> | 2011-10-28 15:48:24 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 12:10:41 -0800 |
| commit | b73224fdcf273956ee52c5c0975ee400231f6cdb (patch) | |
| tree | a80648c355d997cec675803093deb63b38384bd0 /arch/unicore32 | |
| parent | cf1c5230cee13a29afb1183796ed2fe124e7b6c0 (diff) | |
| download | kernel_goldelico_gta04-b73224fdcf273956ee52c5c0975ee400231f6cdb.zip kernel_goldelico_gta04-b73224fdcf273956ee52c5c0975ee400231f6cdb.tar.gz kernel_goldelico_gta04-b73224fdcf273956ee52c5c0975ee400231f6cdb.tar.bz2 | |
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>
Diffstat (limited to 'arch/unicore32')
| -rw-r--r-- | arch/unicore32/include/asm/pci.h | 5 | ||||
| -rw-r--r-- | arch/unicore32/kernel/pci.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/unicore32/include/asm/pci.h b/arch/unicore32/include/asm/pci.h index c5b28b4..dd38677 100644 --- a/arch/unicore32/include/asm/pci.h +++ b/arch/unicore32/include/asm/pci.h @@ -17,11 +17,6 @@ #include <asm-generic/pci.h> #include <mach/hardware.h> /* for PCIBIOS_MIN_* */ -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/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c index 4892fbb..a8f07fe 100644 --- a/arch/unicore32/kernel/pci.c +++ b/arch/unicore32/kernel/pci.c @@ -309,6 +309,11 @@ char * __devinit pcibios_setup(char *str) return str; } +void pcibios_set_master(struct pci_dev *dev) +{ + /* No special bus mastering setup handling */ +} + /* * From arch/i386/kernel/pci-i386.c: * |