Merge branch 'linus' into test

Conflicts:
	MAINTAINERS
	arch/x86/kernel/acpi/boot.c
	arch/x86/kernel/acpi/sleep.c
	drivers/acpi/Kconfig
	drivers/pnp/Makefile
	drivers/pnp/quirks.c

Signed-off-by: Len Brown <len.brown@intel.com>

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)
         spin_unlock_irqrestore(&rtc_lock, flags);
 
         if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                BCD_TO_BIN(sec);
-                BCD_TO_BIN(min);
-                BCD_TO_BIN(hr);
-                BCD_TO_BIN(day);
-                BCD_TO_BIN(mo);
-                BCD_TO_BIN(yr);
-                BCD_TO_BIN(cent);
+                sec = bcd2bin(sec);
+                min = bcd2bin(min);
+                hr = bcd2bin(hr);
+                day = bcd2bin(day);
+                mo = bcd2bin(mo);
+                yr = bcd2bin(yr);
+                cent = bcd2bin(cent);
         }
 
         /* we're trusting the FADT (see above) */
@@ -204,7 +204,7 @@ static u32 cmos_bcd_read(int offset, int rtc_control)
 {
         u32 val = CMOS_READ(offset);
         if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-                BCD_TO_BIN(val);
+                val = bcd2bin(val);
         return val;
 }
 
@@ -212,7 +212,7 @@ static u32 cmos_bcd_read(int offset, int rtc_control)
 static void cmos_bcd_write(u32 val, int offset, int rtc_control)
 {
         if (!(rtc_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
-                BIN_TO_BCD(val);
+                val = bin2bcd(val);
         CMOS_WRITE(val, offset);
 }