From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: linux-pci@vger.kernel.org
Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org,
davem@davemloft.net, bheglaas@google.com, monstr@monstr.eu,
tglx@linutronix.de, bigeasy@linutronix.de,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 6/6] pci/of: Consolidate pci_bus_to_OF_node()
Date: Mon, 11 Apr 2011 14:12:50 +1000 [thread overview]
Message-ID: <1302495170-973-7-git-send-email-benh@kernel.crashing.org> (raw)
In-Reply-To: <1302495170-973-1-git-send-email-benh@kernel.crashing.org>
The generic code always get the device-node in the right place now
so a single implementation will work for all archs
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/microblaze/include/asm/pci-bridge.h | 5 -----
arch/powerpc/include/asm/pci-bridge.h | 5 -----
arch/x86/include/asm/prom.h | 6 ------
include/linux/pci.h | 5 +++++
4 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h
index 0d74d03..242be57 100644
--- a/arch/microblaze/include/asm/pci-bridge.h
+++ b/arch/microblaze/include/asm/pci-bridge.h
@@ -102,11 +102,6 @@ struct pci_controller {
};
#ifdef CONFIG_PCI
-static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
-{
- return bus->dev.of_node;
-}
-
static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
{
return bus->sysdata;
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 578060e..90bd3ed 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -169,11 +169,6 @@ static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
return bus->sysdata;
}
-static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
-{
- return bus->dev.of_node;
-}
-
#ifndef CONFIG_PPC64
extern int pci_device_from_OF_node(struct device_node *node,
diff --git a/arch/x86/include/asm/prom.h b/arch/x86/include/asm/prom.h
index dd6066a..df12870 100644
--- a/arch/x86/include/asm/prom.h
+++ b/arch/x86/include/asm/prom.h
@@ -30,12 +30,6 @@ extern void add_dtb(u64 data);
extern void x86_add_irq_domains(void);
void __cpuinit x86_of_pci_init(void);
void x86_dtb_init(void);
-
-static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
-{
- return pci_device_to_OF_node(bus->self);
-}
-
#else
static inline void add_dtb(u64 data) { }
static inline void x86_add_irq_domains(void) { }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 73dab8a..532c4e8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1559,6 +1559,11 @@ static inline struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
return pdev ? pdev->dev.of_node : NULL;
}
+static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
+{
+ return bus ? bus->dev.of_node : NULL;
+}
+
#else /* CONFIG_OF */
static inline void pci_set_of_node(struct pci_dev *dev) { }
static inline void pci_release_of_node(struct pci_dev *dev) { }
--
1.7.1
next prev parent reply other threads:[~2011-04-11 4:13 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-11 4:12 [PATCHES v3] pci/of: Generic PCI <-> OF matching Benjamin Herrenschmidt
2011-04-11 4:12 ` [PATCH 1/6] pci/of: Match PCI devices to OF nodes dynamically Benjamin Herrenschmidt
2011-04-19 5:19 ` Grant Likely
2011-04-11 4:12 ` [PATCH 2/6] microblaze/pci: Remove powermac originated cruft Benjamin Herrenschmidt
2011-04-11 4:12 ` [PATCH 3/6] microblaze/pci: Move the remains of pci_32.c to pci-common.c Benjamin Herrenschmidt
2011-04-11 15:12 ` Rolf Eike Beer
2011-04-11 21:25 ` Benjamin Herrenschmidt
2011-04-11 4:12 ` [PATCH 4/6] x86/devicetree: Use generic PCI <-> OF matching Benjamin Herrenschmidt
2011-04-11 4:12 ` [PATCH 5/6] pci/of: Consolidate pci_device_to_OF_node() Benjamin Herrenschmidt
2011-04-11 4:12 ` Benjamin Herrenschmidt [this message]
2011-04-19 5:24 ` [PATCH 6/6] pci/of: Consolidate pci_bus_to_OF_node() Grant Likely
2011-04-12 8:53 ` [PATCHES v3] pci/of: Generic PCI <-> OF matching Sebastian Andrzej Siewior
2011-04-19 5:58 ` Michal Simek
2011-06-07 5:58 ` Benjamin Herrenschmidt
2011-06-07 16:05 ` Jesse Barnes
2011-06-07 21:37 ` Benjamin Herrenschmidt
2011-06-08 0:06 ` Benjamin Herrenschmidt
2011-06-08 0:28 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1302495170-973-7-git-send-email-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=bheglaas@google.com \
--cc=bigeasy@linutronix.de \
--cc=davem@davemloft.net \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=monstr@monstr.eu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).