powerpc: mpc8xx: get rid of the multiple PVR_ values

Avoid hardcoding the PVR values in C since they are defined
in processor.h

At the same time, remove those multiple PVR values for 8xx and
keep only one that we call PVR_8xx

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c
index 9da73ac22e2b6273ce6a7652f045aa9baff1878c..5a81bed5a1028c74c9b52e26b927c04debe7da6a 100644 (file)
--- a/arch/powerpc/cpu/mpc8xx/cpu.c
+++ b/arch/powerpc/cpu/mpc8xx/cpu.c
@@ -42,7 +42,7 @@ static int check_CPU(long clock, uint pvr, uint immr)
 
        /* the highest 16 bits should be 0x0050 for a 860 */
 
-       if ((pvr >> 16) != 0x0050)
+       if (PVR_VER(pvr) != PVR_VER(PVR_8xx))
                return -1;
 
        k = (immr << 16) |

diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 57b11b83657960824cda5ea3873e294f6cbc71c7..6fbe8c46b31843155e9a51750a9fcb4fb73e2720 100644 (file)
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -973,10 +973,8 @@
  * differentiated by the version number in the Communication Processor
  * Module (CPM).
  */
-#define PVR_821                0x00500000
-#define PVR_823                PVR_821
-#define PVR_850                PVR_821
-#define PVR_860                PVR_821
+#define PVR_8xx                0x00500000
+
 #define PVR_7400       0x000C0000
 
 /*