powerpc: Rename 64-bit PVR constants to PVR_foo

We have an old FIXME in reg.h which points out that we should standardise
on PVR_foo for our PVR #defines. Currently we use PVR_ on 32-bit and PV_
on 64-bit.

So do that rename and remove the FIXME.

Seeing as we're touching all but one usage of __is_processor(), rename it
to something less ugly and more indicative of what it does, which is
simply to check the PVR version.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 95ae77dec3f6..caffffa5b8f2 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -61,10 +61,10 @@ static int power4_reg_setup(struct op_counter_config *ctr,
         else
                 mmcr0_val |= MMCR0_PROBLEM_DISABLE;
 
-        if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||
-            __is_processor(PV_970) || __is_processor(PV_970FX) ||
-            __is_processor(PV_970MP) || __is_processor(PV_970GX) ||
-            __is_processor(PV_POWER5) || __is_processor(PV_POWER5p))
+        if (pvr_version_is(PVR_POWER4) || pvr_version_is(PVR_POWER4p) ||
+            pvr_version_is(PVR_970) || pvr_version_is(PVR_970FX) ||
+            pvr_version_is(PVR_970MP) || pvr_version_is(PVR_970GX) ||
+            pvr_version_is(PVR_POWER5) || pvr_version_is(PVR_POWER5p))
                 use_slot_nums = 1;
 
         return 0;
@@ -84,9 +84,9 @@ extern void ppc_enable_pmcs(void);
  */
 static inline int mmcra_must_set_sample(void)
 {
-        if (__is_processor(PV_POWER4) || __is_processor(PV_POWER4p) ||
-            __is_processor(PV_970) || __is_processor(PV_970FX) ||
-            __is_processor(PV_970MP) || __is_processor(PV_970GX))
+        if (pvr_version_is(PVR_POWER4) || pvr_version_is(PVR_POWER4p) ||
+            pvr_version_is(PVR_970) || pvr_version_is(PVR_970FX) ||
+            pvr_version_is(PVR_970MP) || pvr_version_is(PVR_970GX))
                 return 1;
 
         return 0;
@@ -276,7 +276,7 @@ static bool pmc_overflow(unsigned long val)
          * PMCs because a user might set a period of less than 256 and we
          * don't want to mistakenly reset them.
          */
-        if (__is_processor(PV_POWER7) && ((0x80000000 - val) <= 256))
+        if (pvr_version_is(PVR_POWER7) && ((0x80000000 - val) <= 256))
                 return true;
 
         return false;