summaryrefslogtreecommitdiffstats
path: root/kernel/arch/mips/sibyte/common/bus_watcher.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/arch/mips/sibyte/common/bus_watcher.c')
-rw-r--r--kernel/arch/mips/sibyte/common/bus_watcher.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/arch/mips/sibyte/common/bus_watcher.c b/kernel/arch/mips/sibyte/common/bus_watcher.c
index 5581844c9..a4e55999e 100644
--- a/kernel/arch/mips/sibyte/common/bus_watcher.c
+++ b/kernel/arch/mips/sibyte/common/bus_watcher.c
@@ -81,10 +81,7 @@ void check_bus_watcher(void)
{
u32 status, l2_err, memio_err;
-#ifdef CONFIG_SB1_PASS_1_WORKAROUNDS
- /* Destructive read, clears register and interrupt */
- status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS));
-#elif defined(CONFIG_SIBYTE_BCM112X) || defined(CONFIG_SIBYTE_SB1250)
+#if defined(CONFIG_SIBYTE_BCM112X) || defined(CONFIG_SIBYTE_SB1250)
/* Use non-destructive register */
status = csr_in32(IOADDR(A_SCD_BUS_ERR_STATUS_DEBUG));
#elif defined(CONFIG_SIBYTE_BCM1x55) || defined(CONFIG_SIBYTE_BCM1x80)
@@ -253,4 +250,4 @@ int __init sibyte_bus_watcher(void)
return 0;
}
-__initcall(sibyte_bus_watcher);
+device_initcall(sibyte_bus_watcher);