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

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

[Becky Bruce]

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(-)

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)
-- 
1.5.5.1

Re: [PATCH 1/2] Drop redundant machine type print in show_cpuinfo

[Kumar Gala]

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

RE: [PATCH 1/2] Drop redundant machine type print in show_cpuinfo

[Welch, Martyn (GE EntSol, Intelligent Platforms)]

Kumar Gala wrote:
> On Sep 24, 2008, at 4:53 PM, Becky Bruce wrote:
>=20
>> 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.
>>=20
>> 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(-)
>=20
> Do any of the board maintainers have issue with this change? Martyn,
> Paul?
>=20
> I'm fine w/it for the FSL ones.
>=20
> - k

No problem here.

Martyn

--=20
Martyn Welch MEng MPhil MIET
Principal Software Engineer

GE Fanuc Intelligent Platforms
Tove Valley Business Park, Towcester,
Northants, NN12 6PF, United Kingdom

Telephone: +44 (0) 1327 359444
Direct Dial: +44 (0) 1327 322748
Fax: +44 (0) 1327 322800
email: martyn.welch@gefanuc.com
web: www.gefanuc.com

GE Fanuc Intelligent Platforms Ltd, registered in England and Wales
(3828642) at 100 Barbirolli Square, Manchester, M2 3AB, VAT GB 729 849
476

GE Fanuc Intelligent Platforms Confidential and Proprietary. If you
have received this message in error please notify us immediately and
permanently remove it from your system and destroy any printed
hardcopies. =20

Re: [PATCH 1/2] Drop redundant machine type print in show_cpuinfo

[Paul Gortmaker]

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(-)
>

Re: [PATCH 1/2] Drop redundant machine type print in show_cpuinfo

[Kumar Gala]

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

Re: [PATCH 1/2] Drop redundant machine type print in show_cpuinfo

[Martyn Welch]

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(-)
> 

-- 
Martyn Welch MEng MPhil MIET (Principal Software Engineer)   T:+44(0)1327322748
GE Fanuc Intelligent Platforms Ltd,        |Registered in England and Wales
Tove Valley Business Park, Towcester,      |(3828642) at 100 Barbirolli Square,
Northants, NN12 6PF, UK T:+44(0)1327359444 |Manchester,M2 3AB  VAT:GB 729849476

Re: [PATCH 1/2] Drop redundant machine type print in show_cpuinfo

[Kumar Gala]

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