All of lore.kernel.org
 help / color / mirror / Atom feed
From: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
To: monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org,
	sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org,
	benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org,
	jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org,
	davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org,
	microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org,
	linuxppc-dev-mnsaURCQ41sdnm+yROfE0A@public.gmane.org, sparclinu
Subject: [PATCH 5/9] of: put default string compare and #a/s-cell values into common header
Date: Sat, 13 Feb 2010 09:02:53 -0700	[thread overview]
Message-ID: <20100213160252.4767.94582.stgit__7193.36120314455$1266077220$gmane$org@angua> (raw)
In-Reply-To: <20100213154838.4767.83881.stgit@angua>

Most architectures don't need to change these.  Put them into common
code to eliminate some duplication

Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
---

 arch/microblaze/include/asm/prom.h |    7 -------
 arch/powerpc/include/asm/prom.h    |    7 -------
 include/linux/of.h                 |   13 +++++++++++++
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 6c6b386..ddc5c57 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -26,13 +26,6 @@
 #include <asm/irq.h>
 #include <asm/atomic.h>
 
-#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT	1
-#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT	1
-
-#define of_compat_cmp(s1, s2, l)	strncasecmp((s1), (s2), (l))
-#define of_prop_cmp(s1, s2)		strcmp((s1), (s2))
-#define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))
-
 extern struct device_node *of_chosen;
 
 #define HAVE_ARCH_DEVTREE_FIXUPS
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index f384db8..4a5070e 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -23,13 +23,6 @@
 #include <asm/irq.h>
 #include <asm/atomic.h>
 
-#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT	1
-#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT	1
-
-#define of_compat_cmp(s1, s2, l)	strcasecmp((s1), (s2))
-#define of_prop_cmp(s1, s2)		strcmp((s1), (s2))
-#define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))
-
 extern struct device_node *of_chosen;
 
 #define HAVE_ARCH_DEVTREE_FIXUPS
diff --git a/include/linux/of.h b/include/linux/of.h
index 48b0ee6..5cd2840 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -116,6 +116,19 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
 
 #include <asm/prom.h>
 
+/* Default #address and #size cells.  Allow arch asm/prom.h to override */
+#if !defined(OF_ROOT_NODE_ADDR_CELLS_DEFAULT)
+#define OF_ROOT_NODE_ADDR_CELLS_DEFAULT 1
+#define OF_ROOT_NODE_SIZE_CELLS_DEFAULT 1
+#endif
+
+/* Default string compare functions, Allow arch asm/prom.h to override */
+#if !defined(of_compat_cmp)
+#define of_compat_cmp(s1, s2, l)	strncasecmp((s1), (s2), (l))
+#define of_prop_cmp(s1, s2)		strcmp((s1), (s2))
+#define of_node_cmp(s1, s2)		strcasecmp((s1), (s2))
+#endif
+
 /* flag descriptions */
 #define OF_DYNAMIC	1 /* node and properties were allocated via kmalloc */
 #define OF_DETACHED	2 /* node has been detached from the device tree */

  parent reply	other threads:[~2010-02-13 16:02 UTC|newest]

Thread overview: 77+ 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 ` Grant Likely
2010-02-13 16:02 ` [PATCH 1/9] of: Remove old and misplaced function declarations Grant Likely
2010-02-13 16:02   ` Grant Likely
2010-02-13 16:02   ` Grant Likely
2010-02-14  6:09   ` Benjamin Herrenschmidt
2010-02-14  6:09     ` Benjamin Herrenschmidt
2010-02-14  6:09     ` Benjamin Herrenschmidt
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-13 16:02   ` Grant Likely
2010-02-14  6:09   ` Benjamin Herrenschmidt
2010-02-14  6:09     ` Benjamin Herrenschmidt
2010-02-14  6:09     ` Benjamin Herrenschmidt
2010-02-13 16:02 ` Grant Likely
2010-02-13 16:02 ` [PATCH 3/9] of: protect linux/of.h with CONFIG_OF Grant Likely
2010-02-13 16:02   ` Grant Likely
2010-02-14  6:10   ` Benjamin Herrenschmidt
2010-02-14  6:10     ` Benjamin Herrenschmidt
2010-02-14  6:10     ` Benjamin Herrenschmidt
2010-02-14  7:13     ` WALID
2010-02-14 14:06     ` Grant Likely
2010-02-14 14:06       ` Grant Likely
2010-02-14 14:06       ` Grant Likely
2010-02-13 16:02 ` Grant Likely
2010-02-13 16:02 ` [PATCH 4/9] of/flattree: Don't assume HAVE_LMB Grant Likely
2010-02-13 16:02 ` Grant Likely
2010-02-13 16:02   ` Grant Likely
2010-02-14  6:11   ` Benjamin Herrenschmidt
2010-02-14  6:11     ` Benjamin Herrenschmidt
2010-02-14  6:11     ` Benjamin Herrenschmidt
2010-02-14  6:11     ` Benjamin Herrenschmidt
2010-02-14 14:00   ` Michal Simek
2010-02-14 14:00     ` Michal Simek
2010-02-14 14:00     ` Michal Simek
2010-02-14 14:08     ` Grant Likely
2010-02-14 14:08       ` Grant Likely
2010-02-14 14:08       ` Grant Likely
2010-02-14 14:08       ` Grant Likely
2010-02-13 16:02 ` Grant Likely [this message]
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-13 16:02   ` [PATCH 5/9] of: put default string compare and #a/s-cell values into Grant Likely
2010-02-14  6:11   ` [PATCH 5/9] of: put default string compare and #a/s-cell values into common header Benjamin Herrenschmidt
2010-02-14  6:11     ` Benjamin Herrenschmidt
2010-02-14  6:11     ` [PATCH 5/9] of: put default string compare and #a/s-cell Benjamin Herrenschmidt
2010-02-13 16:02 ` [PATCH 6/9] of: remove unused extern reference to devtree_lock Grant Likely
2010-02-13 16:02   ` Grant Likely
2010-02-14  6:12   ` Benjamin Herrenschmidt
2010-02-14  6:12     ` Benjamin Herrenschmidt
2010-02-14  6:12     ` Benjamin Herrenschmidt
2010-02-13 16:02 ` Grant Likely
2010-02-13 16:03 ` [PATCH 7/9] of: move definition of of_chosen into common code Grant Likely
2010-02-13 16:03 ` Grant Likely
2010-02-13 16:03   ` Grant Likely
2010-02-14  6:12   ` Benjamin Herrenschmidt
2010-02-14  6:12     ` Benjamin Herrenschmidt
2010-02-14  6:12     ` Benjamin Herrenschmidt
2010-02-14  6:12     ` 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-13 16:03 ` Grant Likely
2010-02-13 16:03   ` [PATCH 8/9] of/sparc: Remove sparc-local declaration of allnodes and Grant Likely
2010-02-14  6:13   ` [PATCH 8/9] of/sparc: Remove sparc-local declaration of allnodes and devtree_lock Benjamin Herrenschmidt
2010-02-14  6:13     ` Benjamin Herrenschmidt
2010-02-14  6:13     ` [PATCH 8/9] of/sparc: Remove sparc-local declaration of Benjamin Herrenschmidt
2010-02-14 19:50   ` [PATCH 8/9] of/sparc: Remove sparc-local declaration of allnodes and devtree_lock David Miller
2010-02-14 19:50     ` David Miller
2010-02-14 19:50     ` [PATCH 8/9] of/sparc: Remove sparc-local declaration of David Miller
2010-02-13 16:03 ` [PATCH 9/9] of: remove undefined request_OF_resource & release_OF_resource Grant Likely
2010-02-13 16:03   ` [PATCH 9/9] of: remove undefined request_OF_resource & Grant Likely
2010-02-14  6:14   ` [PATCH 9/9] of: remove undefined request_OF_resource & release_OF_resource Benjamin Herrenschmidt
2010-02-14  6:14     ` Benjamin Herrenschmidt
2010-02-14  6:14     ` [PATCH 9/9] of: remove undefined request_OF_resource & Benjamin Herrenschmidt
2010-02-14  6:14     ` [PATCH 9/9] of: remove undefined request_OF_resource & release_OF_resource Benjamin Herrenschmidt
2010-02-13 16:03 ` Grant Likely
2010-02-14 14:06 ` [PATCH 0/9] Random OF cleanups and merges Michal Simek
2010-02-14 14:06   ` Michal Simek
2010-02-14 14:06   ` 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='20100213160252.4767.94582.stgit__7193.36120314455$1266077220$gmane$org@angua' \
    --to=grant.likely-s3s/wqlpoipyb63q8fvjnq@public.gmane.org \
    --cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \
    --cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
    --cc=jeremy.kerr-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org \
    --cc=linuxppc-dev-mnsaURCQ41sdnm+yROfE0A@public.gmane.org \
    --cc=microblaze-uclinux-rVRm/Wmeqae7NGdpmJTKYQ@public.gmane.org \
    --cc=monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org \
    --cc=sfr-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.