get_immr() is always called with 0 as an argument, so it is useless.
Signed-off-by: Christophe Leroy christophe.leroy@c-s.fr --- arch/powerpc/cpu/mpc8xx/cpu.c | 2 +- arch/powerpc/cpu/mpc8xx/immap.c | 2 +- arch/powerpc/include/asm/ppc.h | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index 20d042d3a19..c5669e6a8e0 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -90,7 +90,7 @@ static int check_CPU(long clock, uint pvr, uint immr) int checkcpu(void) { ulong clock = gd->cpu_clk; - uint immr = get_immr(0); /* Return full IMMR contents */ + uint immr = get_immr(); /* Return full IMMR contents */ uint pvr = get_pvr();
puts("CPU: "); diff --git a/arch/powerpc/cpu/mpc8xx/immap.c b/arch/powerpc/cpu/mpc8xx/immap.c index 7ef486053c2..0cbfe900771 100644 --- a/arch/powerpc/cpu/mpc8xx/immap.c +++ b/arch/powerpc/cpu/mpc8xx/immap.c @@ -349,7 +349,7 @@ void print_reginfo(void) sit8xx_t __iomem *timers = &immap->im_sit;
printf("\nSystem Configuration registers\n" - "\tIMMR\t0x%08X\n", get_immr(0)); + "\tIMMR\t0x%08X\n", get_immr()); do_siuinfo(NULL, 0, 0, NULL);
printf("Memory Controller Registers\n"); diff --git a/arch/powerpc/include/asm/ppc.h b/arch/powerpc/include/asm/ppc.h index c8d87a91b40..8e76c38ea39 100644 --- a/arch/powerpc/include/asm/ppc.h +++ b/arch/powerpc/include/asm/ppc.h @@ -40,11 +40,9 @@
#include <asm/processor.h>
-static inline uint get_immr(uint mask) +static inline uint get_immr(void) { - uint immr = mfspr(SPRN_IMMR); - - return mask ? (immr & mask) : immr; + return mfspr(SPRN_IMMR); }
static inline uint get_pvr(void)