From: Paul Gortmaker <paul.gortmaker@windriver•com>
To: Scott Wood <scottwood@freescale•com>
Cc: linuxppc-dev@ozlabs•org, sfr@canb•auug.org.au
Subject: Re: [PATCH] 86xx: mark functions static, other minor cleanups
Date: Fri, 11 Apr 2008 14:43:20 -0400 [thread overview]
Message-ID: <20080411184312.GA23941@windriver.com> (raw)
In-Reply-To: <20080411171628.GA3203@loki.buserror.net>
In message: Re: [PATCH] 86xx: mark functions static, other minor cleanups
on 11/04/2008 Scott Wood wrote:
> > model = "MPC8641HPCN";
> > - compatible = "mpc86xx";
> > + compatible = "fsl,mpc86xx";
> > #address-cells = <1>;
> > #size-cells = <1>;
>
> If we're changing the compatible, change it to something proper (e.g.
> fsl,mpc8641hpcn).
>
Updated as per above, and with tickerized prefixes for sbc8641.
Paul.
---
>From 8278c7ec25c1aadc92c71ca4e4b8e51b2c02a49a Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver•com>
Date: Fri, 11 Apr 2008 12:51:04 -0400
Subject: [PATCH] 86xx: mark functions static, other minor cleanups
Cleanups as suggested by Stephen Rothwell and Dale Farnsworth, which
incudes: mark a bunch of functions static; add vendor prefix to the
compat node check for uniqueness, add in missing of_node_put(), delete
unused DBG macros.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver•com>
---
arch/powerpc/boot/dts/mpc8641_hpcn.dts | 2 +-
arch/powerpc/boot/dts/sbc8641d.dts | 2 +-
arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 4 ++--
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 8 ++++----
arch/powerpc/platforms/86xx/sbc8641d.c | 17 +++++------------
5 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 79385bc..7f9b999 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -13,7 +13,7 @@
/ {
model = "MPC8641HPCN";
- compatible = "mpc86xx";
+ compatible = "fsl,mpc8641hpcn";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/boot/dts/sbc8641d.dts b/arch/powerpc/boot/dts/sbc8641d.dts
index 27b5a3d..f2d85b3 100644
--- a/arch/powerpc/boot/dts/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/sbc8641d.dts
@@ -17,7 +17,7 @@
/ {
model = "SBC8641D";
- compatible = "mpc86xx";
+ compatible = "wind,sbc8641";
#address-cells = <1>;
#size-cells = <1>;
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 0b07485..18b8ebe 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -52,7 +52,7 @@ static int __init mpc8610_declare_of_platform_devices(void)
}
machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
-void __init
+static void __init
mpc86xx_hpcd_init_irq(void)
{
struct mpic *mpic1;
@@ -200,7 +200,7 @@ static int __init mpc86xx_hpcd_probe(void)
return 0;
}
-long __init
+static long __init
mpc86xx_time_init(void)
{
unsigned int temp;
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index cfbe8c5..0764032 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -55,7 +55,7 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
}
#endif /* CONFIG_PCI */
-void __init
+static void __init
mpc86xx_hpcn_init_irq(void)
{
struct mpic *mpic1;
@@ -162,7 +162,7 @@ mpc86xx_hpcn_setup_arch(void)
}
-void
+static void
mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
{
struct device_node *root;
@@ -190,13 +190,13 @@ static int __init mpc86xx_hpcn_probe(void)
{
unsigned long root = of_get_flat_dt_root();
- if (of_flat_dt_is_compatible(root, "mpc86xx"))
+ if (of_flat_dt_is_compatible(root, "fsl,mpc8641hpcn"))
return 1; /* Looks good */
return 0;
}
-long __init
+static long __init
mpc86xx_time_init(void)
{
unsigned int temp;
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index c7516be..510a06e 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -37,15 +37,7 @@
#include "mpc86xx.h"
-#undef DEBUG
-
-#ifdef DEBUG
-#define DBG(fmt...) do { printk(KERN_ERR fmt); } while(0)
-#else
-#define DBG(fmt...) do { } while(0)
-#endif
-
-void __init
+static void __init
sbc8641_init_irq(void)
{
struct mpic *mpic1;
@@ -62,6 +54,7 @@ sbc8641_init_irq(void)
mpic1 = mpic_alloc(np, res.start,
MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
0, 256, " MPIC ");
+ of_node_put(np);
BUG_ON(mpic1 == NULL);
mpic_init(mpic1);
@@ -90,7 +83,7 @@ sbc8641_setup_arch(void)
}
-void
+static void
sbc8641_show_cpuinfo(struct seq_file *m)
{
struct device_node *root;
@@ -118,13 +111,13 @@ static int __init sbc8641_probe(void)
{
unsigned long root = of_get_flat_dt_root();
- if (of_flat_dt_is_compatible(root, "mpc86xx"))
+ if (of_flat_dt_is_compatible(root, "wind,sbc8641"))
return 1; /* Looks good */
return 0;
}
-long __init
+static long __init
mpc86xx_time_init(void)
{
unsigned int temp;
--
1.5.4.3
next prev parent reply other threads:[~2008-04-11 18:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-11 16:59 [PATCH] 86xx: mark functions static, other minor cleanups Paul Gortmaker
2008-04-11 17:16 ` Scott Wood
2008-04-11 18:43 ` Paul Gortmaker [this message]
2008-04-11 19:11 ` Segher Boessenkool
2008-04-15 1:32 ` Paul Gortmaker
2008-04-18 0:35 ` David Gibson
2008-04-11 18:28 ` Segher Boessenkool
2008-04-15 16:11 ` Timur Tabi
2008-04-15 16:28 ` Paul Gortmaker
2008-04-15 16:31 ` Timur Tabi
2008-04-15 22:46 ` Paul Gortmaker
2008-04-15 23:01 ` Kumar Gala
2008-04-15 23:24 ` Kumar Gala
2008-04-16 17:53 ` [PATCH 1/2] " Paul Gortmaker
2008-04-16 17:53 ` [PATCH 2/2] mpc86xx_hpcn: Temporarily accept old dts node identifier Paul Gortmaker
2008-04-17 14:57 ` Kumar Gala
2008-04-17 14:57 ` [PATCH 1/2] 86xx: mark functions static, other minor cleanups Kumar Gala
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=20080411184312.GA23941@windriver.com \
--to=paul.gortmaker@windriver$(echo .)com \
--cc=linuxppc-dev@ozlabs$(echo .)org \
--cc=scottwood@freescale$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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