dm: replace dm_dbg() with pr_debug()

[u-boot] / arch / powerpc / lib / interrupts.c

diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c
index f7cf915759de29bdc5731561417eaf185a74f1bc..e8784aa16e9cd5149611feee31d6371310d8bf50 100644 (file)
--- a/arch/powerpc/lib/interrupts.c
+++ b/arch/powerpc/lib/interrupts.c
@@ -11,7 +11,7 @@
 #include <common.h>
 #include <asm/processor.h>
 #include <watchdog.h>
-#ifdef CONFIG_STATUS_LED
+#ifdef CONFIG_LED_STATUS
 #include <status_led.h>
 #endif
 
@@ -28,25 +28,8 @@ void __board_show_activity (ulong dummy)
 #define CONFIG_SYS_WATCHDOG_FREQ (CONFIG_SYS_HZ / 2)
 #endif
 
-extern int interrupt_init_cpu (unsigned *);
-extern void timer_interrupt_cpu (struct pt_regs *);
-
 static unsigned decrementer_count; /* count value for 1e6/HZ microseconds */
 
-static __inline__ unsigned long get_msr (void)
-{
-       unsigned long msr;
-
-       asm volatile ("mfmsr %0":"=r" (msr):);
-
-       return msr;
-}
-
-static __inline__ void set_msr (unsigned long msr)
-{
-       asm volatile ("mtmsr %0"::"r" (msr));
-}
-
 static __inline__ unsigned long get_dec (void)
 {
        unsigned long val;
@@ -80,13 +63,8 @@ int disable_interrupts (void)
 
 int interrupt_init (void)
 {
-       int ret;
-
        /* call cpu specific function from $(CPU)/interrupts.c */
-       ret = interrupt_init_cpu (&decrementer_count);
-
-       if (ret)
-               return ret;
+       interrupt_init_cpu (&decrementer_count);
 
        set_dec (decrementer_count);
 
@@ -112,9 +90,9 @@ void timer_interrupt (struct pt_regs *regs)
                WATCHDOG_RESET ();
 #endif    /* CONFIG_WATCHDOG || CONFIG_HW_WATCHDOG */
 
-#ifdef CONFIG_STATUS_LED
+#ifdef CONFIG_LED_STATUS
        status_led_tick (timestamp);
-#endif /* CONFIG_STATUS_LED */
+#endif /* CONFIG_LED_STATUS */
 
 #ifdef CONFIG_SHOW_ACTIVITY
        board_show_activity (timestamp);