diff options
Diffstat (limited to 'drivers/acpi/sleep')
-rw-r--r-- | drivers/acpi/sleep/proc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c index bf5b04de02d1..631ee2ee2ca0 100644 --- a/drivers/acpi/sleep/proc.c +++ b/drivers/acpi/sleep/proc.c | |||
@@ -120,13 +120,13 @@ static int acpi_system_alarm_seq_show(struct seq_file *seq, void *offset) | |||
120 | spin_unlock_irqrestore(&rtc_lock, flags); | 120 | spin_unlock_irqrestore(&rtc_lock, flags); |
121 | 121 | ||
122 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { | 122 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { |
123 | BCD_TO_BIN(sec); | 123 | sec = bcd2bin(sec); |
124 | BCD_TO_BIN(min); | 124 | min = bcd2bin(min); |
125 | BCD_TO_BIN(hr); | 125 | hr = bcd2bin(hr); |
126 | BCD_TO_BIN(day); | 126 | day = bcd2bin(day); |
127 | BCD_TO_BIN(mo); | 127 | mo = bcd2bin(mo); |
128 | BCD_TO_BIN(yr); | 128 | yr = bcd2bin(yr); |
129 | BCD_TO_BIN(cent); | 129 | cent = bcd2bin(cent); |
130 | } | 130 | } |
131 | 131 | ||
132 | /* we're trusting the FADT (see above) */ | 132 | /* we're trusting the FADT (see above) */ |
@@ -204,7 +204,7 @@ static u32 cmos_bcd_read(int offset, int rtc_control) | |||
204 | { | 204 | { |
205 | u32 val = CMOS_READ(offset); | 205 | u32 val = CMOS_READ(offset); |
206 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | 206 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) |
207 | BCD_TO_BIN(val); | 207 | val = bcd2bin(val); |
208 | return val; | 208 | return val; |
209 | } | 209 | } |
210 | 210 | ||
@@ -212,7 +212,7 @@ static u32 cmos_bcd_read(int offset, int rtc_control) | |||
212 | static void cmos_bcd_write(u32 val, int offset, int rtc_control) | 212 | static void cmos_bcd_write(u32 val, int offset, int rtc_control) |
213 | { | 213 | { |
214 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) | 214 | if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) |
215 | BIN_TO_BCD(val); | 215 | val = bin2bcd(val); |
216 | CMOS_WRITE(val, offset); | 216 | CMOS_WRITE(val, offset); |
217 | } | 217 | } |
218 | 218 | ||