Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1bcf7e3 authored by Adrian Bunk's avatar Adrian Bunk Committed by Russell King
Browse files

[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: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ae82cbfc

arch/arm/mach-footbridge/time.c

+9 −9
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ static unsigned long __init get_isa_cmos_time(void) 
	} while (sec != CMOS_READ(RTC_SECONDS));



	if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {

		BCD_TO_BIN(sec);

		BCD_TO_BIN(min);

		BCD_TO_BIN(hour);

		BCD_TO_BIN(day);

		BCD_TO_BIN(mon);

		BCD_TO_BIN(year);

		sec = bcd2bin(sec);

		min = bcd2bin(min);

		hour = bcd2bin(hour);

		day = bcd2bin(day);

		mon = bcd2bin(mon);

		year = bcd2bin(year);

	}

	if ((year += 1900) < 1970)

		year += 100;
@@ -76,7 +76,7 @@ static int set_isa_cmos_time(void) 


	cmos_minutes = CMOS_READ(RTC_MINUTES);

	if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)

		BCD_TO_BIN(cmos_minutes);

		cmos_minutes = bcd2bin(cmos_minutes);



	/*

	 * since we're only adjusting minutes and seconds,
@@ -92,8 +92,8 @@ static int set_isa_cmos_time(void) 


	if (abs(real_minutes - cmos_minutes) < 30) {

		if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {

			BIN_TO_BCD(real_seconds);

			BIN_TO_BCD(real_minutes);

			real_seconds = bin2bcd(real_seconds);

			real_minutes = bin2bcd(real_minutes);

		}

		CMOS_WRITE(real_seconds,RTC_SECONDS);

		CMOS_WRITE(real_minutes,RTC_MINUTES);