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

Commit 18b1bd05 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

alpha: use bcd2bin/bin2bcd 



Change alpha 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>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ab527d75

arch/alpha/kernel/core_marvel.c

+2 −2
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ __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
@@ -668,7 +668,7 @@ __marvel_rtc_io(u8 b, unsigned long addr, int write) 
#else

		__marvel_access_rtc(&rtc_access);

#endif

		ret = BIN_TO_BCD(rtc_access.data);

		ret = bin2bcd(rtc_access.data);

		break;



	default:

arch/alpha/kernel/time.c

+9 −9
Original line number Diff line number Diff line
@@ -346,12 +346,12 @@ time_init(void) 
	year = CMOS_READ(RTC_YEAR);



	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);

	}



	/* PC-like is standard; used for year >= 70 */
@@ -525,7 +525,7 @@ set_rtc_mmss(unsigned long nowtime) 


	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,
@@ -543,8 +543,8 @@ set_rtc_mmss(unsigned long nowtime) 


	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);