Skip to content

Commit 0161dca

Browse files
Becky Brucekumargala
authored andcommitted
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: Becky Bruce <becky.bruce@freescale.com> Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Martyn Welch <martyn.welch@gefanuc.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
1 parent 20d38e0 commit 0161dca

File tree

6 files changed

+0
-27
lines changed

6 files changed

+0
-27
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
213213
svid = mfspr(SPRN_SVR);
214214

215215
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
216-
seq_printf(m, "Machine\t\t: mpc85xx\n");
217216
seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
218217
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
219218

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)
200200
svid = mfspr(SPRN_SVR);
201201

202202
seq_printf(m, "Vendor\t\t: Wind River\n");
203-
seq_printf(m, "Machine\t\t: SBC8560\n");
204203
seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
205204
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
206205

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,11 @@ static void __init gef_sbc610_setup_arch(void)
6666

6767
static void gef_sbc610_show_cpuinfo(struct seq_file *m)
6868
{
69-
struct device_node *root;
7069
uint memsize = total_memory;
71-
const char *model = "";
7270
uint svid = mfspr(SPRN_SVR);
7371

7472
seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
7573

76-
root = of_find_node_by_path("/");
77-
if (root)
78-
model = of_get_property(root, "model", NULL);
79-
seq_printf(m, "Machine\t\t: %s\n", model);
80-
of_node_put(root);
81-
8274
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
8375
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
8476
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,19 +101,11 @@ mpc86xx_hpcn_setup_arch(void)
101101
static void
102102
mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
103103
{
104-
struct device_node *root;
105104
uint memsize = total_memory;
106-
const char *model = "";
107105
uint svid = mfspr(SPRN_SVR);
108106

109107
seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
110108

111-
root = of_find_node_by_path("/");
112-
if (root)
113-
model = of_get_property(root, "model", NULL);
114-
seq_printf(m, "Machine\t\t: %s\n", model);
115-
of_node_put(root);
116-
117109
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
118110
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
119111
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,11 @@ sbc8641_setup_arch(void)
6363
static void
6464
sbc8641_show_cpuinfo(struct seq_file *m)
6565
{
66-
struct device_node *root;
6766
uint memsize = total_memory;
68-
const char *model = "";
6967
uint svid = mfspr(SPRN_SVR);
7068

7169
seq_printf(m, "Vendor\t\t: Wind River Systems\n");
7270

73-
root = of_find_node_by_path("/");
74-
if (root)
75-
model = of_get_property(root, "model", NULL);
76-
seq_printf(m, "Machine\t\t: %s\n", model);
77-
of_node_put(root);
78-
7971
seq_printf(m, "SVR\t\t: 0x%x\n", svid);
8072
seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
8173
}

arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ static void __init mpc7448_hpc2_init_IRQ(void)
164164
void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
165165
{
166166
seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
167-
seq_printf(m, "machine\t\t: MPC7448hpc2\n");
168167
}
169168

170169
void mpc7448_hpc2_restart(char *cmd)

0 commit comments

Comments
 (0)