diff options
| author | Myron Stowe <mstowe@redhat.com> | 2011-10-28 15:47:56 -0600 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 12:10:38 -0800 |
| commit | b51d4a3e36c6148f1c044b2d4412e7d2ddb77bd1 (patch) | |
| tree | 4afda80f736efff088e6573ff188564b94c3f34f | |
| parent | 91e86df1a08875bbba9d00d33dc3098f4fd95d4d (diff) | |
| download | linux-3.10-b51d4a3e36c6148f1c044b2d4412e7d2ddb77bd1.tar.gz linux-3.10-b51d4a3e36c6148f1c044b2d4412e7d2ddb77bd1.tar.bz2 linux-3.10-b51d4a3e36c6148f1c044b2d4412e7d2ddb77bd1.zip | |
PCI: MicroBlaze: convert pcibios_set_master() to a non-inlined function
This patch converts MicroBlaze'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 MicroBlaze'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/microblaze/include/asm/pci.h | 5 | ||||
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index 1dd9d6b1e27..033137628e8 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -42,11 +42,6 @@ struct pci_dev; */ #define pcibios_assign_all_busses() 0 -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/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index db841c7b9d5..52b643dd31b 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -190,6 +190,11 @@ int pcibios_add_platform_entries(struct pci_dev *pdev) return device_create_file(&pdev->dev, &dev_attr_devspec); } +void pcibios_set_master(struct pci_dev *dev) +{ + /* No special bus mastering setup handling */ +} + char __devinit *pcibios_setup(char *str) { return str; |