Patchwork [1/2] Drop redundant machine type print in show_cpuinfo

login
register
mail settings
Submitter Becky Bruce
Date Sept. 24, 2008, 9:53 p.m.
Message ID <1222293214-22698-1-git-send-email-becky.bruce@freescale.com>
Download mbox | patch
Permalink /patch/1355/
State Accepted
Commit 0161dca52d950676d727336cef1441ea2bcfba98
Headers show

Comments

Becky Bruce - Sept. 24, 2008, 9:53 p.m.
For many of the embedded boards, "model" and "Machine" are printing
the same thing; remove the redundant code and allow the generic
show_cpuinfo to print the model information.

Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
---
 arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
 arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
 arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
 arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
 arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
 6 files changed, 0 insertions(+), 27 deletions(-)
Kumar Gala - Sept. 29, 2008, 1:35 p.m.
On Sep 24, 2008, at 4:53 PM, Becky Bruce wrote:

> For many of the embedded boards, "model" and "Machine" are printing
> the same thing; remove the redundant code and allow the generic
> show_cpuinfo to print the model information.
>
> Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
> ---
> arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
> arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
> arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
> arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
> arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
> arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
> 6 files changed, 0 insertions(+), 27 deletions(-)

Do any of the board maintainers have issue with this change? Martyn,  
Paul?

I'm fine w/it for the FSL ones.

- k
Martyn Welch - Sept. 29, 2008, 1:56 p.m.
Kumar Gala wrote:
> On Sep 24, 2008, at 4:53 PM, Becky Bruce wrote:
> 
>> For many of the embedded boards, "model" and "Machine" are printing
>> the same thing; remove the redundant code and allow the generic
>> show_cpuinfo to print the model information.
>> 
>> Signed-off-by: Becky Bruce <becky.bruce@freescale.com> ---
>> arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
>> arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
>> arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
>> arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
>> arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
>> arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
>> 6 files changed, 0 insertions(+), 27 deletions(-)
> 
> Do any of the board maintainers have issue with this change? Martyn,
> Paul?
> 
> I'm fine w/it for the FSL ones.
> 
> - k

No problem here.

Martyn
Paul Gortmaker - Sept. 29, 2008, 2:08 p.m.
On Wed, Sep 24, 2008 at 5:53 PM, Becky Bruce <becky.bruce@freescale.com> wrote:
> For many of the embedded boards, "model" and "Machine" are printing
> the same thing; remove the redundant code and allow the generic
> show_cpuinfo to print the model information.

Sounds good to me.  Thanks for changing the sbc boards as well.

>
> Signed-off-by: Becky Bruce <becky.bruce@freescale.com>

Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com>

> ---
>  arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
>  arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
>  arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
>  arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
>  arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
>  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
>  6 files changed, 0 insertions(+), 27 deletions(-)
>
Kumar Gala - Sept. 29, 2008, 2:23 p.m.
On Sep 24, 2008, at 4:53 PM, Becky Bruce wrote:

> For many of the embedded boards, "model" and "Machine" are printing
> the same thing; remove the redundant code and allow the generic
> show_cpuinfo to print the model information.
>
> Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
> ---
> arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
> arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
> arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
> arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
> arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
> arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
> 6 files changed, 0 insertions(+), 27 deletions(-)

applied.

- k
Martyn Welch - Sept. 29, 2008, 2:24 p.m.
On Wed, 24 Sep 2008 16:53:34 -0500
Becky Bruce <becky.bruce@freescale.com> wrote:
> For many of the embedded boards, "model" and "Machine" are printing
> the same thing; remove the redundant code and allow the generic
> show_cpuinfo to print the model information.
> 

No prob.

> Signed-off-by: Becky Bruce <becky.bruce@freescale.com>

Acked-by: Martyn Welch <martyn.welch@gefanuc.com>

> ---
>  arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
>  arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
>  arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
>  arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
>  arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
>  arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
>  6 files changed, 0 insertions(+), 27 deletions(-)
>
Kumar Gala - Sept. 29, 2008, 2:25 p.m.
On Sep 24, 2008, at 4:53 PM, Becky Bruce wrote:

> For many of the embedded boards, "model" and "Machine" are printing
> the same thing; remove the redundant code and allow the generic
> show_cpuinfo to print the model information.
>
> Signed-off-by: Becky Bruce <becky.bruce@freescale.com>
> ---
> arch/powerpc/platforms/85xx/mpc85xx_ads.c         |    1 -
> arch/powerpc/platforms/85xx/sbc8560.c             |    1 -
> arch/powerpc/platforms/86xx/gef_sbc610.c          |    8 --------
> arch/powerpc/platforms/86xx/mpc86xx_hpcn.c        |    8 --------
> arch/powerpc/platforms/86xx/sbc8641d.c            |    8 --------
> arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c |    1 -
> 6 files changed, 0 insertions(+), 27 deletions(-)

applied

- k

Patch

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index d17807a..0293e3d 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -213,7 +213,6 @@  static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
 	svid = mfspr(SPRN_SVR);
 
 	seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
-	seq_printf(m, "Machine\t\t: mpc85xx\n");
 	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index e0cf060..0c9a856 100644
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -200,7 +200,6 @@  static void sbc8560_show_cpuinfo(struct seq_file *m)
 	svid = mfspr(SPRN_SVR);
 
 	seq_printf(m, "Vendor\t\t: Wind River\n");
-	seq_printf(m, "Machine\t\t: SBC8560\n");
 	seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index 3543a9e..8a9dee2 100644
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -66,19 +66,11 @@  static void __init gef_sbc610_setup_arch(void)
 
 static void gef_sbc610_show_cpuinfo(struct seq_file *m)
 {
-	struct device_node *root;
 	uint memsize = total_memory;
-	const char *model = "";
 	uint svid = mfspr(SPRN_SVR);
 
 	seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
 
-	root = of_find_node_by_path("/");
-	if (root)
-		model = of_get_property(root, "model", NULL);
-	seq_printf(m, "Machine\t\t: %s\n", model);
-	of_node_put(root);
-
 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index f712d9c..2672829 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -101,19 +101,11 @@  mpc86xx_hpcn_setup_arch(void)
 static void
 mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
 {
-	struct device_node *root;
 	uint memsize = total_memory;
-	const char *model = "";
 	uint svid = mfspr(SPRN_SVR);
 
 	seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
 
-	root = of_find_node_by_path("/");
-	if (root)
-		model = of_get_property(root, "model", NULL);
-	seq_printf(m, "Machine\t\t: %s\n", model);
-	of_node_put(root);
-
 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 00e6fad..da677a7 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -63,19 +63,11 @@  sbc8641_setup_arch(void)
 static void
 sbc8641_show_cpuinfo(struct seq_file *m)
 {
-	struct device_node *root;
 	uint memsize = total_memory;
-	const char *model = "";
 	uint svid = mfspr(SPRN_SVR);
 
 	seq_printf(m, "Vendor\t\t: Wind River Systems\n");
 
-	root = of_find_node_by_path("/");
-	if (root)
-		model = of_get_property(root, "model", NULL);
-	seq_printf(m, "Machine\t\t: %s\n", model);
-	of_node_put(root);
-
 	seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 	seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 84e2d78..7a2ba39 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -164,7 +164,6 @@  static void __init mpc7448_hpc2_init_IRQ(void)
 void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
 {
 	seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
-	seq_printf(m, "machine\t\t: MPC7448hpc2\n");
 }
 
 void mpc7448_hpc2_restart(char *cmd)