alpha: fix RTC on marvel

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / core_marvel.c

diff --git a/arch/alpha/kernel/core_marvel.c b/arch/alpha/kernel/core_marvel.c
index 04dcc5e5d4c1c4954d8c80186ac3390d1a9074cc..e302daecbe56cbe5ac5a9cca91046da88fad51da 100644 (file)
--- a/arch/alpha/kernel/core_marvel.c
+++ b/arch/alpha/kernel/core_marvel.c
@@ -655,20 +655,12 @@ __marvel_rtc_io(u8 b, unsigned long addr, int write)
 
        case 0x71:                                      /* RTC_PORT(1) */
                rtc_access.index = index;
-               rtc_access.data = BCD_TO_BIN(b);
+               rtc_access.data = bcd2bin(b);
                rtc_access.function = 0x48 + !write;    /* GET/PUT_TOY */
 
-#ifdef CONFIG_SMP
-               if (smp_processor_id() != boot_cpuid)
-                       smp_call_function_single(boot_cpuid,
-                                                __marvel_access_rtc,
-                                                &rtc_access, 1);
-               else
-                       __marvel_access_rtc(&rtc_access);
-#else
                __marvel_access_rtc(&rtc_access);
-#endif
-               ret = BIN_TO_BCD(rtc_access.data);
+
+               ret = bin2bcd(rtc_access.data);
                break;
 
        default: