From: Grant Likely <grant.likely@secretlab.ca>
To: linuxppc-dev@lists.ozlabs.org, benh@kernel.crashing.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
davem@davemloft.net, sparclinux@vger.kernel.org,
monstr@monstr.eu, microblaze-uclinux@itee.uq.edu.au,
devicetree-discuss@lists.ozlabs.org
Subject: [RFC PATCH 11/12] of: merge other miscellaneous prototypes
Date: Tue, 06 Oct 2009 22:32:14 -0600 [thread overview]
Message-ID: <20091007043207.16890.89075.stgit@angua> (raw)
In-Reply-To: <20091007041007.16890.62194.stgit@angua>
Merge common prototypes used by Microblaze and PowerPC
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
arch/microblaze/include/asm/prom.h | 12 ------------
arch/powerpc/include/asm/prom.h | 14 --------------
include/linux/of_fdt.h | 13 +++++++++++++
3 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index be4db2a..ef3ec1d 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -45,19 +45,7 @@ extern void of_attach_node(struct device_node *);
extern void of_detach_node(struct device_node *);
/* Other Prototypes */
-extern void finish_device_tree(void);
-extern void unflatten_device_tree(void);
extern int early_uartlite_console(void);
-extern void early_init_devtree(void *);
-extern int machine_is_compatible(const char *compat);
-extern void print_properties(struct device_node *node);
-extern int prom_n_intr_cells(struct device_node *np);
-extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
-extern int prom_add_property(struct device_node *np, struct property *prop);
-extern int prom_remove_property(struct device_node *np, struct property *prop);
-extern int prom_update_property(struct device_node *np,
- struct property *newprop,
- struct property *oldprop);
extern struct resource *request_OF_resource(struct device_node *node,
int index, const char *name_postfix);
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index c8b5933..2ab9cbd 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -38,20 +38,6 @@ extern struct device_node *of_chosen;
extern void of_attach_node(struct device_node *);
extern void of_detach_node(struct device_node *);
-/* Other Prototypes */
-extern void finish_device_tree(void);
-extern void unflatten_device_tree(void);
-extern void early_init_devtree(void *);
-extern int machine_is_compatible(const char *compat);
-extern void print_properties(struct device_node *node);
-extern int prom_n_intr_cells(struct device_node* np);
-extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
-extern int prom_add_property(struct device_node* np, struct property* prop);
-extern int prom_remove_property(struct device_node *np, struct property *prop);
-extern int prom_update_property(struct device_node *np,
- struct property *newprop,
- struct property *oldprop);
-
#ifdef CONFIG_PPC32
/*
* PCI <-> OF matching functions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
index ac31d4f..b41bd18 100644
--- a/include/linux/of_fdt.h
+++ b/include/linux/of_fdt.h
@@ -71,4 +71,17 @@ extern int __init of_flat_dt_is_compatible(unsigned long node,
const char *name);
extern unsigned long __init of_get_flat_dt_root(void);
+/* Other Prototypes */
+extern void finish_device_tree(void);
+extern void unflatten_device_tree(void);
+extern void early_init_devtree(void *);
+extern int machine_is_compatible(const char *compat);
+extern void print_properties(struct device_node *node);
+extern int prom_n_intr_cells(struct device_node* np);
+extern void prom_get_irq_senses(unsigned char *senses, int off, int max);
+extern int prom_add_property(struct device_node* np, struct property* prop);
+extern int prom_remove_property(struct device_node *np, struct property *prop);
+extern int prom_update_property(struct device_node *np,
+ struct property *newprop,
+ struct property *oldprop);
#endif /* _LINUX_OF_FDT_H */
next prev parent reply other threads:[~2009-10-07 4:32 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-07 4:29 [RFC PATCH 00/12] Merge common OpenFirmware device tree code Grant Likely
2009-10-07 4:30 ` [RFC PATCH 01/12] of: Rework linux/of.h and asm/prom.h include ordering Grant Likely
2009-10-07 4:30 ` [RFC PATCH 02/12] of: merge phandle, ihandle and struct property Grant Likely
2009-10-07 4:30 ` [RFC PATCH 03/12] of: merge struct device_node Grant Likely
2009-10-07 4:30 ` [RFC PATCH 04/12] of: Move OF_IS_DYNAMIC and OF_MARK_DYNAMIC macros to of.h Grant Likely
2009-10-07 4:30 ` [RFC PATCH 05/12] of: add common header for flattened device tree representation Grant Likely
2009-10-07 4:57 ` Stephen Rothwell
2009-10-07 12:14 ` [microblaze-uclinux] " Michal Simek
2009-10-07 13:38 ` Grant Likely
2009-10-07 14:07 ` Michal Simek
2009-10-07 5:14 ` Benjamin Herrenschmidt
2009-10-07 13:41 ` Grant Likely
2009-10-09 6:35 ` David Gibson
2009-10-09 7:07 ` Grant Likely
2009-10-14 4:47 ` David Gibson
2009-10-07 4:31 ` [RFC PATCH 06/12] of: merge struct boot_param_header from Microblaze and PowerPC Grant Likely
2009-10-07 4:31 ` [RFC PATCH 07/12] of: merge of_node_*_flag() and set_node_proc_entry() Grant Likely
2009-10-07 4:31 ` [RFC PATCH 08/12] of: merge of_read_number() an of_read_ulong() Grant Likely
2009-10-07 4:31 ` [RFC PATCH 09/12] of: merge of_node_get(), of_node_put() and of_find_all_nodes() Grant Likely
2009-10-07 4:32 ` [RFC PATCH 10/12] of: merge of_*_flat_dt*() functions Grant Likely
2009-10-09 6:36 ` David Gibson
2009-10-09 7:03 ` Grant Likely
2009-10-07 4:32 ` Grant Likely [this message]
2009-10-07 4:32 ` [RFC PATCH 12/12] of: merge of_find_all_nodes() implementations Grant Likely
2009-10-07 4:49 ` [RFC PATCH 00/12] Merge common OpenFirmware device tree code Grant Likely
2009-10-07 5:18 ` Julian Calaby
2009-10-07 13:52 ` Sam Creasey
2009-10-07 19:30 ` Mitch Bradley
2009-10-07 20:54 ` Chris Newport
2009-10-07 21:09 ` David Miller
2009-10-08 1:29 ` Chris Newport
2009-10-08 4:39 ` David Miller
2009-10-08 13:24 ` Kjetil Oftedal
2009-10-07 22:57 ` Brad Boyer
2009-10-07 7:09 ` Rob Landley
2009-10-07 14:02 ` Grant Likely
2009-10-07 14:21 ` [microblaze-uclinux] " Michal Simek
2009-10-07 7:27 ` David Miller
2009-10-07 16:39 ` Stephen Neuendorffer
2009-10-07 9:02 ` Wolfram Sang
2009-10-15 1:00 ` Stephen Rothwell
2009-10-15 1:01 ` [PATCH 1/2] of: create asm/of.h Stephen Rothwell
2009-10-15 1:02 ` [PATCH 2/2] of: move struct property to asm/of.h Stephen Rothwell
2009-10-15 17:06 ` [RFC PATCH 00/12] Merge common OpenFirmware device tree code Grant Likely
2009-10-15 23:38 ` Stephen Rothwell
2009-10-16 3:18 ` Grant Likely
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=20091007043207.16890.89075.stgit@angua \
--to=grant.likely@secretlab.ca \
--cc=benh@kernel.crashing.org \
--cc=davem@davemloft.net \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linuxppc-dev@lists.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).