Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0161dca52d950676d727336cef1441ea2bcfba98

Authored by Becky Bruce
Committed by Kumar Gala
1 parent 20d38e01d4

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>

Showing 6 changed files with 0 additions and 27 deletions Side-by-side Diff

arch/powerpc/platforms/85xx/mpc85xx_ads.c
Diff comments   View file @ 0161dca
... ... @@ -213,7 +213,6 @@
213 213 svid = mfspr(SPRN_SVR);
214 214  
215 215 seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
216   - seq_printf(m, "Machine\t\t: mpc85xx\n");
217 216 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
218 217 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
219 218  
arch/powerpc/platforms/85xx/sbc8560.c
Diff comments   View file @ 0161dca
... ... @@ -200,7 +200,6 @@
200 200 svid = mfspr(SPRN_SVR);
201 201  
202 202 seq_printf(m, "Vendor\t\t: Wind River\n");
203   - seq_printf(m, "Machine\t\t: SBC8560\n");
204 203 seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
205 204 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
206 205  
arch/powerpc/platforms/86xx/gef_sbc610.c
Diff comments   View file @ 0161dca
... ... @@ -66,18 +66,10 @@
66 66  
67 67 static void gef_sbc610_show_cpuinfo(struct seq_file *m)
68 68 {
69   - struct device_node *root;
70 69 uint memsize = total_memory;
71   - const char *model = "";
72 70 uint svid = mfspr(SPRN_SVR);
73 71  
74 72 seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
75   -
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 73  
82 74 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
83 75 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
Diff comments   View file @ 0161dca
... ... @@ -101,18 +101,10 @@
101 101 static void
102 102 mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
103 103 {
104   - struct device_node *root;
105 104 uint memsize = total_memory;
106   - const char *model = "";
107 105 uint svid = mfspr(SPRN_SVR);
108 106  
109 107 seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
110   -
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 108  
117 109 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
118 110 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
arch/powerpc/platforms/86xx/sbc8641d.c
Diff comments   View file @ 0161dca
... ... @@ -63,18 +63,10 @@
63 63 static void
64 64 sbc8641_show_cpuinfo(struct seq_file *m)
65 65 {
66   - struct device_node *root;
67 66 uint memsize = total_memory;
68   - const char *model = "";
69 67 uint svid = mfspr(SPRN_SVR);
70 68  
71 69 seq_printf(m, "Vendor\t\t: Wind River Systems\n");
72   -
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 70  
79 71 seq_printf(m, "SVR\t\t: 0x%x\n", svid);
80 72 seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
Diff comments   View file @ 0161dca
... ... @@ -164,7 +164,6 @@
164 164 void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
165 165 {
166 166 seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
167   - seq_printf(m, "machine\t\t: MPC7448hpc2\n");
168 167 }
169 168  
170 169 void mpc7448_hpc2_restart(char *cmd)