@@ -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: ");
@@ -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");
@@ -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)
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(-)