[src/trunk]: src/sys/arch/arm Nuke cpu_pfr, just use the armreg_pfr?_read inl...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e9084c33e86c
branches:  trunk
changeset: 787342:e9084c33e86c
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jun 12 01:16:48 2013 +0000

description:
Nuke cpu_pfr, just use the armreg_pfr?_read inlines

diffstat:

 sys/arch/arm/arm/cpufunc.c     |   6 +++---
 sys/arch/arm/arm32/cpu.c       |  25 ++-----------------------
 sys/arch/arm/include/cpufunc.h |   2 --
 3 files changed, 5 insertions(+), 28 deletions(-)

diffs (92 lines):

diff -r daf5e63039ef -r e9084c33e86c sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Wed Jun 12 00:59:50 2013 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Wed Jun 12 01:16:48 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.121 2013/06/12 00:35:34 matt Exp $       */
+/*     $NetBSD: cpufunc.c,v 1.122 2013/06/12 01:16:48 matt Exp $       */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.121 2013/06/12 00:35:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.122 2013/06/12 01:16:48 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -2080,7 +2080,7 @@
            cputype == CPU_ID_MV88SV584X_V7 ||
            cputype == CPU_ID_ARM_88SV581X_V6 ||
            cputype == CPU_ID_ARM_88SV581X_V7) &&
-           (cpu_pfr(0) & ARM_PFR0_THUMBEE_MASK)) {
+           (armreg_pfr0_read() & ARM_PFR0_THUMBEE_MASK)) {
                        cpufuncs = pj4bv7_cpufuncs;
                        get_cachetype_cp15();
                        pmap_pte_init_armv7();
diff -r daf5e63039ef -r e9084c33e86c sys/arch/arm/arm32/cpu.c
--- a/sys/arch/arm/arm32/cpu.c  Wed Jun 12 00:59:50 2013 +0000
+++ b/sys/arch/arm/arm32/cpu.c  Wed Jun 12 01:16:48 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.95 2013/06/12 00:44:39 matt Exp $    */
+/*     $NetBSD: cpu.c,v 1.96 2013/06/12 01:16:48 matt Exp $    */
 
 /*
  * Copyright (c) 1995 Mark Brinicombe.
@@ -46,7 +46,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.95 2013/06/12 00:44:39 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.96 2013/06/12 01:16:48 matt Exp $");
 
 #include <sys/systm.h>
 #include <sys/conf.h>
@@ -74,7 +74,6 @@
 void identify_arm_cpu(device_t dv, struct cpu_info *);
 void identify_cortex_caches(device_t dv);
 void identify_features(device_t dv);
-u_int cpu_pfr(int num);
 
 /*
  * Identify the master (boot) CPU
@@ -579,26 +578,6 @@
        }
 }
 
-u_int
-cpu_pfr(int num)
-{
-       u_int feat;
-
-       switch (num) {
-       case 0: feat = armreg_pfr0_read();
-               break;
-       case 1: feat = armreg_pfr1_read();
-               break;
-       default:
-               panic("Processor Feature Register %d not implemented", num);
-               break;
-       }
-
-       return (feat);
-}
-
-
-
 void
 identify_arm_cpu(device_t dv, struct cpu_info *ci)
 {
diff -r daf5e63039ef -r e9084c33e86c sys/arch/arm/include/cpufunc.h
--- a/sys/arch/arm/include/cpufunc.h    Wed Jun 12 00:59:50 2013 +0000
+++ b/sys/arch/arm/include/cpufunc.h    Wed Jun 12 01:16:48 2013 +0000
@@ -221,8 +221,6 @@
 u_int  cpufunc_faultstatus     (void);
 u_int  cpufunc_faultaddress    (void);
 
-u_int  cpu_pfr                 (int);
-
 #if defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3)
 void   arm3_cache_flush        (void);
 #endif /* CPU_ARM2 || CPU_ARM250 || CPU_ARM3 */