Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0161dca5 authored by Becky Bruce's avatar Becky Bruce Committed by Kumar Gala
Browse files

powerpc: Drop redundant machine type print in show_cpuinfo 



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: default avatarBecky Bruce <becky.bruce@freescale.com>
Acked-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Acked-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 20d38e01

arch/powerpc/platforms/85xx/mpc85xx_ads.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/85xx/sbc8560.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/86xx/gef_sbc610.c

+0 −8
Original line number Diff line number Diff line
@@ -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));

}

arch/powerpc/platforms/86xx/mpc86xx_hpcn.c

+0 −8
Original line number Diff line number Diff line
@@ -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));

}

arch/powerpc/platforms/86xx/sbc8641d.c

+0 −8
Original line number Diff line number Diff line
@@ -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));

}