MIPS: Netlogic: Use PRID_IMP_MASK macro

Use PRID_IMP_MASK macro instead of 0xff00 to extract the processor
type.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/6868/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 4 insertions, 4 deletions

diff --git a/arch/mips/include/asm/netlogic/mips-extns.h b/arch/mips/include/asm/netlogic/mips-extns.h
index de9aada6f4c1..38af905bf07e 100644
--- a/arch/mips/include/asm/netlogic/mips-extns.h
+++ b/arch/mips/include/asm/netlogic/mips-extns.h
@@ -146,9 +146,9 @@ static inline int hard_smp_processor_id(void)
 
 static inline int nlm_nodeid(void)
 {
-        uint32_t prid = read_c0_prid();
+        uint32_t prid = read_c0_prid() & PRID_IMP_MASK;
 
-        if ((prid & 0xff00) == PRID_IMP_NETLOGIC_XLP9XX)
+        if (prid == PRID_IMP_NETLOGIC_XLP9XX)
                 return (__read_32bit_c0_register($15, 1) >> 7) & 0x7;
         else
                 return (__read_32bit_c0_register($15, 1) >> 5) & 0x3;
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index bd7dda096506..a11b289956e6 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -99,7 +99,7 @@ void *xlp_dt_init(void *fdtp);
 
 static inline int cpu_is_xlpii(void)
 {
-        int chip = read_c0_prid() & 0xff00;
+        int chip = read_c0_prid() & PRID_IMP_MASK;
 
         return chip == PRID_IMP_NETLOGIC_XLP2XX ||
                 chip == PRID_IMP_NETLOGIC_XLP9XX;
@@ -107,7 +107,7 @@ static inline int cpu_is_xlpii(void)
 
 static inline int cpu_is_xlp9xx(void)
 {
-        int chip = read_c0_prid() & 0xff00;
+        int chip = read_c0_prid() & PRID_IMP_MASK;
 
         return chip == PRID_IMP_NETLOGIC_XLP9XX;
 }