[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111028214756.20088.20651.stgit@amt.stowe>
Date: Fri, 28 Oct 2011 15:47:56 -0600
From: Myron Stowe <myron.stowe@...hat.com>
To: jbarnes@...tuousgeek.org
Cc: linux-pci@...r.kernel.org, linux@....linux.org.uk,
vapier@...too.org, dhowells@...hat.com, ysato@...rs.sourceforge.jp,
tony.luck@...el.com, fenghua.yu@...el.com, monstr@...str.eu,
ralf@...ux-mips.org, benh@...nel.crashing.org, paulus@...ba.org,
lethal@...ux-sh.org, davem@...emloft.net, cmetcalf@...era.com,
gxt@...c.pku.edu.cn, tglx@...utronix.de, mingo@...hat.com,
chris@...kel.net, linux-kernel@...r.kernel.org
Subject: [PATCH -v2 04/16] PCI: MicroBlaze: convert pcibios_set_master() to a
non-inlined function
From: Myron Stowe <mstowe@...hat.com>
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@...hat.com>
---
arch/microblaze/include/asm/pci.h | 5 -----
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 1dd9d6b..0331376 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 4cfae20..1a500c5 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -189,6 +189,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;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists