[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20111028214831.20088.34181.stgit@amt.stowe>
Date: Fri, 28 Oct 2011 15:48:31 -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 09/16] PCI: Xtensa: convert pcibios_set_master() to a
non-inlined function
From: Myron Stowe <mstowe@...hat.com>
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@...hat.com>
---
arch/xtensa/include/asm/pci.h | 5 -----
arch/xtensa/kernel/pci.c | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/xtensa/include/asm/pci.h b/arch/xtensa/include/asm/pci.h
index 4609b0f..05244f0 100644
--- a/arch/xtensa/include/asm/pci.h
+++ b/arch/xtensa/include/asm/pci.h
@@ -22,11 +22,6 @@
extern struct pci_controller* pcibios_alloc_controller(void);
-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)
{
/* We don't do dynamic PCI IRQ allocation */
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index cd10269..644b2d4 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -227,6 +227,11 @@ char __init *pcibios_setup(char *str)
return str;
}
+void pcibios_set_master(struct pci_dev *dev)
+{
+ /* No special bus mastering setup handling */
+}
+
/* the next one is stolen from the alpha port... */
void __init
--
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