Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[ARM] use bcd2bin/bin2bcd
This patch changes arm to use the new bcd2bin/bin2bcd functions instead
of the obsolete BCD_TO_BIN/BIN_TO_BCD macros.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
authored by Adrian Bunk and committed by Russell King f1bcf7e3 ae82cbfc
+9
-9
arch/arm/mach-footbridge/time.c
+9
-9
arch/arm/mach-footbridge/time.c
···
49
} while (sec != CMOS_READ(RTC_SECONDS));
50
51
if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
52
-
BCD_TO_BIN(sec);
53
-
BCD_TO_BIN(min);
54
-
BCD_TO_BIN(hour);
55
-
BCD_TO_BIN(day);
56
-
BCD_TO_BIN(mon);
57
-
BCD_TO_BIN(year);
58
}
59
if ((year += 1900) < 1970)
60
year += 100;
···
76
77
cmos_minutes = CMOS_READ(RTC_MINUTES);
78
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
79
-
BCD_TO_BIN(cmos_minutes);
80
81
/*
82
* since we're only adjusting minutes and seconds,
···
92
93
if (abs(real_minutes - cmos_minutes) < 30) {
94
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
95
-
BIN_TO_BCD(real_seconds);
96
-
BIN_TO_BCD(real_minutes);
97
}
98
CMOS_WRITE(real_seconds,RTC_SECONDS);
99
CMOS_WRITE(real_minutes,RTC_MINUTES);
···
49
} while (sec != CMOS_READ(RTC_SECONDS));
50
51
if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
52
+
sec = bcd2bin(sec);
53
+
min = bcd2bin(min);
54
+
hour = bcd2bin(hour);
55
+
day = bcd2bin(day);
56
+
mon = bcd2bin(mon);
57
+
year = bcd2bin(year);
58
}
59
if ((year += 1900) < 1970)
60
year += 100;
···
76
77
cmos_minutes = CMOS_READ(RTC_MINUTES);
78
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
79
+
cmos_minutes = bcd2bin(cmos_minutes);
80
81
/*
82
* since we're only adjusting minutes and seconds,
···
92
93
if (abs(real_minutes - cmos_minutes) < 30) {
94
if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
95
+
real_seconds = bin2bcd(real_seconds);
96
+
real_minutes = bin2bcd(real_minutes);
97
}
98
CMOS_WRITE(real_seconds,RTC_SECONDS);
99
CMOS_WRITE(real_minutes,RTC_MINUTES);