powerpc: Cleanup vpa code

register_vpa() doesn't actually do a VPA register call it just uses the flags
you pass it, so rename it to vpa_call() to be clearer.

We can then define register_vpa() and unregister_vpa() which are both simple
wrappers around vpa_call(). (we'll need unregister_vpa() for kexec soon)

We can then cleanup vpa_init(), and because vpa_init() is only called from
platforms/pseries we remove the definition in asm-ppc64/smp.h.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>

1 files changed, 3 insertions, 7 deletions

diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 8a7bda3db67..e384a5a9179 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -261,22 +261,18 @@ out:
 void vpa_init(int cpu)
 {
         int hwcpu = get_hard_smp_processor_id(cpu);
-        unsigned long vpa = (unsigned long)&(paca[cpu].lppaca);
+        unsigned long vpa = __pa(&paca[cpu].lppaca);
         long ret;
-        unsigned long flags;
-
-        /* Register the Virtual Processor Area (VPA) */
-        flags = 1UL << (63 - 18);
 
         if (cpu_has_feature(CPU_FTR_ALTIVEC))
                 paca[cpu].lppaca.vmxregs_in_use = 1;
 
-        ret = register_vpa(flags, hwcpu, __pa(vpa));
+        ret = register_vpa(hwcpu, vpa);
 
         if (ret)
                 printk(KERN_ERR "WARNING: vpa_init: VPA registration for "
                                 "cpu %d (hw %d) of area %lx returns %ld\n",
-                                cpu, hwcpu, __pa(vpa), ret);
+                                cpu, hwcpu, vpa, ret);
 }
 
 long pSeries_lpar_hpte_insert(unsigned long hpte_group,