ppc64: Change ppc_md.get_cpuinfo to ppc_md.show_cpuinfo

... for consistency with ppc32; also add in ppc32's show_percpuinfo
function.

Signed-off-by: Paul Mackerras <paulus@samba.org>

6 files changed, 11 insertions, 14 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 6f29614c3581..97ffdcf09c03 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -704,8 +704,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         if (cpu_id == NR_CPUS) {
                 seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
 
-                if (ppc_md.get_cpuinfo != NULL)
-                        ppc_md.get_cpuinfo(m);
+                if (ppc_md.show_cpuinfo != NULL)
+                        ppc_md.show_cpuinfo(m);
 
                 return 0;
         }
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c
index 41cd5b689545..b27901481782 100644
--- a/arch/powerpc/platforms/iseries/setup.c
+++ b/arch/powerpc/platforms/iseries/setup.c
@@ -587,7 +587,7 @@ static void __init iSeries_setup_arch(void)
         printk("Processor version = %x\n", systemcfg->processor);
 }
 
-static void iSeries_get_cpuinfo(struct seq_file *m)
+static void iSeries_show_cpuinfo(struct seq_file *m)
 {
         seq_printf(m, "machine\t\t: 64-bit iSeries Logical Partition\n");
 }
@@ -760,7 +760,7 @@ static int __init iseries_probe(int platform)
 
 struct machdep_calls __initdata iseries_md = {
         .setup_arch     = iSeries_setup_arch,
-        .get_cpuinfo    = iSeries_get_cpuinfo,
+        .show_cpuinfo   = iSeries_show_cpuinfo,
         .init_IRQ       = iSeries_init_IRQ,
         .get_irq        = iSeries_get_irq,
         .init_early     = iSeries_init_early,
diff --git a/arch/ppc64/kernel/bpa_setup.c b/arch/ppc64/kernel/bpa_setup.c
index 017cf23e91fa..c2dc8f282eb8 100644
--- a/arch/ppc64/kernel/bpa_setup.c
+++ b/arch/ppc64/kernel/bpa_setup.c
@@ -55,7 +55,7 @@
 #define DBG(fmt...)
 #endif
 
-void bpa_get_cpuinfo(struct seq_file *m)
+void bpa_show_cpuinfo(struct seq_file *m)
 {
         struct device_node *root;
         const char *model = "";
@@ -129,7 +129,7 @@ struct machdep_calls __initdata bpa_md = {
         .probe                  = bpa_probe,
         .setup_arch             = bpa_setup_arch,
         .init_early             = bpa_init_early,
-        .get_cpuinfo            = bpa_get_cpuinfo,
+        .show_cpuinfo           = bpa_show_cpuinfo,
         .restart                = rtas_restart,
         .power_off              = rtas_power_off,
         .halt                   = rtas_halt,
diff --git a/arch/ppc64/kernel/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index be4c1693d149..c059805d8cce 100644
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
@@ -505,7 +505,7 @@ struct machdep_calls __initdata pmac_md = {
         .probe                  = pmac_probe,
         .setup_arch             = pmac_setup_arch,
         .init_early             = pmac_init_early,
-        .get_cpuinfo            = pmac_show_cpuinfo,
+        .show_cpuinfo           = pmac_show_cpuinfo,
         .init_IRQ               = pmac_init_IRQ,
         .get_irq                = mpic_get_irq,
         .pcibios_fixup          = pmac_pcibios_fixup,
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index 3e6c1547b718..42019be0c6ad 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -703,8 +703,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         if (cpu_id == NR_CPUS) {
                 seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
 
-                if (ppc_md.get_cpuinfo != NULL)
-                        ppc_md.get_cpuinfo(m);
+                if (ppc_md.show_cpuinfo != NULL)
+                        ppc_md.show_cpuinfo(m);
 
                 return 0;
         }
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index f060553b997a..8a0969b6243c 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -86,7 +86,8 @@ struct machdep_calls {
         void            (*setup_arch)(void);
         void            (*init_early)(void);
         /* Optional, may be NULL. */
-        void            (*get_cpuinfo)(struct seq_file *m);
+        void            (*show_cpuinfo)(struct seq_file *m);
+        void            (*show_percpuinfo)(struct seq_file *m, int i);
 
         void            (*init_IRQ)(void);
         int             (*get_irq)(struct pt_regs *);
@@ -153,10 +154,6 @@ struct machdep_calls {
         void            (*enable_pmcs)(void);
 
 #ifdef CONFIG_PPC32     /* XXX for now */
-        /* Optional, may be NULL. */
-        int             (*show_cpuinfo)(struct seq_file *m);
-        int             (*show_percpuinfo)(struct seq_file *m, int i);
-        
         /* A general init function, called by ppc_init in init/main.c.
            May be NULL. */
         void            (*init)(void);