From 6937461ee9eb1e7d2bfaa27a9c024b6a712ea821 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Sun, 27 Apr 2008 17:13:22 +0000 Subject: Remove mfsvr(): o The function is defined unconditionally but depends on SPR_SVR, which is defined conditionally. o spr.h defines mfspr() and mtspr(), which is no worse to use. --- sys/powerpc/include/cpufunc.h | 10 ---------- sys/powerpc/mpc85xx/mpc85xx.c | 2 +- sys/powerpc/mpc85xx/ocpbus.c | 2 +- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sys/powerpc/include/cpufunc.h b/sys/powerpc/include/cpufunc.h index 3eb0ac0e4ac4..a58d4c531673 100644 --- a/sys/powerpc/include/cpufunc.h +++ b/sys/powerpc/include/cpufunc.h @@ -123,16 +123,6 @@ mfpvr(void) return (value); } -static __inline register_t -mfsvr(void) -{ - register_t value; - - __asm __volatile ("mfspr %0, %1" : "=r"(value) : "K"(SPR_SVR)); - - return (value); -} - static __inline void eieio(void) { diff --git a/sys/powerpc/mpc85xx/mpc85xx.c b/sys/powerpc/mpc85xx/mpc85xx.c index 144867ee02dd..62a47a6eefc7 100644 --- a/sys/powerpc/mpc85xx/mpc85xx.c +++ b/sys/powerpc/mpc85xx/mpc85xx.c @@ -50,7 +50,7 @@ __FBSDID("$FreeBSD$"); void cpu_reset() { - uint32_t svr = mfsvr(); + uint32_t svr = mfspr(SPR_SVR); if (svr == SVR_MPC8572E || svr == SVR_MPC8572) /* Systems with dedicated reset register */ diff --git a/sys/powerpc/mpc85xx/ocpbus.c b/sys/powerpc/mpc85xx/ocpbus.c index e85361e96c30..9c1e5837ba1b 100644 --- a/sys/powerpc/mpc85xx/ocpbus.c +++ b/sys/powerpc/mpc85xx/ocpbus.c @@ -233,7 +233,7 @@ ocpbus_probe (device_t dev) sc = device_get_softc(dev); - svr = mfsvr(); + svr = mfspr(SPR_SVR); if (svr == SVR_MPC8572E || svr == SVR_MPC8572) law_max = 12; else -- cgit v1.3