From: Grant Likely <grant.likely@secretlab.ca>
To: monstr@monstr.eu, sfr@canb.auug.org.au, benh@kernel.crashing.org,
jeremy.kerr@canonical.com, davem@davemloft.net,
microblaze-uclinux@itee.uq.edu.au, linuxppc-dev@ozlabs.org,
sparclinux@vger.kernel.org, devicetree-discuss@lists.ozlabs.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] of: move definition of of_chosen into common code.
Date: Sat, 13 Feb 2010 09:03:04 -0700 [thread overview]
Message-ID: <20100213160303.4767.36411.stgit@angua> (raw)
In-Reply-To: <20100213154838.4767.83881.stgit@angua>
Rather than defining of_chosen in each arch, it can be defined for all
in driver/of/base.c
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
arch/microblaze/include/asm/prom.h | 2 --
arch/microblaze/kernel/prom.c | 3 ---
arch/powerpc/include/asm/prom.h | 2 --
arch/powerpc/kernel/prom.c | 3 ---
drivers/of/base.c | 1 +
include/linux/of.h | 1 +
6 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 8b1ebd3..aa1a437 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -26,8 +26,6 @@
#include <asm/irq.h>
#include <asm/atomic.h>
-extern struct device_node *of_chosen;
-
#define HAVE_ARCH_DEVTREE_FIXUPS
/* Other Prototypes */
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index a7dcaf0..a15ef6d 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -42,9 +42,6 @@
#include <asm/sections.h>
#include <asm/pci-bridge.h>
-/* export that to outside world */
-struct device_node *of_chosen;
-
void __init early_init_dt_scan_chosen_arch(unsigned long node)
{
/* No Microblaze specific code here */
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index 4a5070e..7f9a50a 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -23,8 +23,6 @@
#include <asm/irq.h>
#include <asm/atomic.h>
-extern struct device_node *of_chosen;
-
#define HAVE_ARCH_DEVTREE_FIXUPS
#ifdef CONFIG_PPC32
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 4869c93..43238b2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -67,9 +67,6 @@ int __initdata iommu_force_on;
unsigned long tce_alloc_start, tce_alloc_end;
#endif
-/* export that to outside world */
-struct device_node *of_chosen;
-
static int __init early_parse_mem(char *p)
{
if (!p)
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 873479a..cb96888 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -23,6 +23,7 @@
#include <linux/proc_fs.h>
struct device_node *allnodes;
+struct device_node *of_chosen;
/* use when traversing tree through the allnext, child, sibling,
* or parent members of struct device_node.
diff --git a/include/linux/of.h b/include/linux/of.h
index 5cd2840..d34cc5d 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -66,6 +66,7 @@ struct device_node {
/* Pointer for first entry in chain of all nodes. */
extern struct device_node *allnodes;
+extern struct device_node *of_chosen;
static inline int of_node_check_flag(struct device_node *n, unsigned long flag)
{
next prev parent reply other threads:[~2010-02-13 16:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-13 16:02 [PATCH 0/9] Random OF cleanups and merges Grant Likely
2010-02-13 16:02 ` [PATCH 1/9] of: Remove old and misplaced function declarations Grant Likely
2010-02-14 6:09 ` Benjamin Herrenschmidt
2010-02-13 16:02 ` [PATCH 2/9] proc_devtree: fix THIS_MODULE without module.h Grant Likely
2010-02-14 6:09 ` Benjamin Herrenschmidt
2010-02-13 16:02 ` [PATCH 3/9] of: protect linux/of.h with CONFIG_OF Grant Likely
2010-02-14 6:10 ` Benjamin Herrenschmidt
2010-02-14 14:06 ` Grant Likely
2010-02-13 16:02 ` [PATCH 4/9] of/flattree: Don't assume HAVE_LMB Grant Likely
2010-02-14 6:11 ` Benjamin Herrenschmidt
2010-02-14 14:00 ` Michal Simek
2010-02-14 14:08 ` Grant Likely
2010-02-13 16:02 ` [PATCH 5/9] of: put default string compare and #a/s-cell values into common header Grant Likely
2010-02-14 6:11 ` Benjamin Herrenschmidt
2010-02-13 16:02 ` [PATCH 6/9] of: remove unused extern reference to devtree_lock Grant Likely
2010-02-14 6:12 ` Benjamin Herrenschmidt
2010-02-13 16:03 ` Grant Likely [this message]
2010-02-14 6:12 ` [PATCH 7/9] of: move definition of of_chosen into common code Benjamin Herrenschmidt
2010-02-13 16:03 ` [PATCH 8/9] of/sparc: Remove sparc-local declaration of allnodes and devtree_lock Grant Likely
2010-02-14 6:13 ` Benjamin Herrenschmidt
2010-02-14 19:50 ` David Miller
2010-02-13 16:03 ` [PATCH 9/9] of: remove undefined request_OF_resource & release_OF_resource Grant Likely
2010-02-14 6:14 ` Benjamin Herrenschmidt
2010-02-14 14:06 ` [PATCH 0/9] Random OF cleanups and merges Michal Simek
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=20100213160303.4767.36411.stgit@angua \
--to=grant.likely@secretlab.ca \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=jeremy.kerr@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=sfr@canb.auug.org.au \
--cc=sparclinux@vger.kernel.org \
/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).