tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

powerpc: Use bcd2bin/bin2bcd

This changes powerpc 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: Paul Mackerras <paulus@samba.org>

authored by

Adrian Bunk and committed by
Paul Mackerras 8f6ba492 ed95d745

+37 -37
+12 -12
arch/powerpc/platforms/chrp/time.c
··· 94 94 chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT); 95 95 96 96 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { 97 - BIN_TO_BCD(tm.tm_sec); 98 - BIN_TO_BCD(tm.tm_min); 99 - BIN_TO_BCD(tm.tm_hour); 100 - BIN_TO_BCD(tm.tm_mon); 101 - BIN_TO_BCD(tm.tm_mday); 102 - BIN_TO_BCD(tm.tm_year); 97 + tm.tm_sec = bin2bcd(tm.tm_sec); 98 + tm.tm_min = bin2bcd(tm.tm_min); 99 + tm.tm_hour = bin2bcd(tm.tm_hour); 100 + tm.tm_mon = bin2bcd(tm.tm_mon); 101 + tm.tm_mday = bin2bcd(tm.tm_mday); 102 + tm.tm_year = bin2bcd(tm.tm_year); 103 103 } 104 104 chrp_cmos_clock_write(tm.tm_sec,RTC_SECONDS); 105 105 chrp_cmos_clock_write(tm.tm_min,RTC_MINUTES); ··· 136 136 } while (sec != chrp_cmos_clock_read(RTC_SECONDS)); 137 137 138 138 if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { 139 - BCD_TO_BIN(sec); 140 - BCD_TO_BIN(min); 141 - BCD_TO_BIN(hour); 142 - BCD_TO_BIN(day); 143 - BCD_TO_BIN(mon); 144 - BCD_TO_BIN(year); 139 + sec = bcd2bin(sec); 140 + min = bcd2bin(min); 141 + hour = bcd2bin(hour); 142 + day = bcd2bin(day); 143 + mon = bcd2bin(mon); 144 + year = bcd2bin(year); 145 145 } 146 146 if (year < 70) 147 147 year += 100;
+13 -13
arch/powerpc/platforms/iseries/mf.c
··· 722 722 day = tm->tm_mday; 723 723 mon = tm->tm_mon + 1; 724 724 725 - BIN_TO_BCD(sec); 726 - BIN_TO_BCD(min); 727 - BIN_TO_BCD(hour); 728 - BIN_TO_BCD(mon); 729 - BIN_TO_BCD(day); 730 - BIN_TO_BCD(y1); 731 - BIN_TO_BCD(y2); 725 + sec = bin2bcd(sec); 726 + min = bin2bcd(min); 727 + hour = bin2bcd(hour); 728 + mon = bin2bcd(mon); 729 + day = bin2bcd(day); 730 + y1 = bin2bcd(y1); 731 + y2 = bin2bcd(y2); 732 732 733 733 memset(ce_time, 0, sizeof(ce_time)); 734 734 ce_time[3] = 0x41; ··· 777 777 u8 day = ce_msg[10]; 778 778 u8 mon = ce_msg[11]; 779 779 780 - BCD_TO_BIN(sec); 781 - BCD_TO_BIN(min); 782 - BCD_TO_BIN(hour); 783 - BCD_TO_BIN(day); 784 - BCD_TO_BIN(mon); 785 - BCD_TO_BIN(year); 780 + sec = bcd2bin(sec); 781 + min = bcd2bin(min); 782 + hour = bcd2bin(hour); 783 + day = bcd2bin(day); 784 + mon = bcd2bin(mon); 785 + year = bcd2bin(year); 786 786 787 787 if (year <= 69) 788 788 year += 100;
+12 -12
arch/powerpc/platforms/maple/time.c
··· 68 68 69 69 if (!(maple_clock_read(RTC_CONTROL) & RTC_DM_BINARY) 70 70 || RTC_ALWAYS_BCD) { 71 - BCD_TO_BIN(tm->tm_sec); 72 - BCD_TO_BIN(tm->tm_min); 73 - BCD_TO_BIN(tm->tm_hour); 74 - BCD_TO_BIN(tm->tm_mday); 75 - BCD_TO_BIN(tm->tm_mon); 76 - BCD_TO_BIN(tm->tm_year); 71 + tm->tm_sec = bcd2bin(tm->tm_sec); 72 + tm->tm_min = bcd2bin(tm->tm_min); 73 + tm->tm_hour = bcd2bin(tm->tm_hour); 74 + tm->tm_mday = bcd2bin(tm->tm_mday); 75 + tm->tm_mon = bcd2bin(tm->tm_mon); 76 + tm->tm_year = bcd2bin(tm->tm_year); 77 77 } 78 78 if ((tm->tm_year + 1900) < 1970) 79 79 tm->tm_year += 100; ··· 104 104 year = tm->tm_year; 105 105 106 106 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) { 107 - BIN_TO_BCD(sec); 108 - BIN_TO_BCD(min); 109 - BIN_TO_BCD(hour); 110 - BIN_TO_BCD(mon); 111 - BIN_TO_BCD(mday); 112 - BIN_TO_BCD(year); 107 + sec = bin2bcd(sec); 108 + min = bin2bcd(min); 109 + hour = bin2bcd(hour); 110 + mon = bin2bcd(mon); 111 + mday = bin2bcd(mday); 112 + year = bin2bcd(year); 113 113 } 114 114 maple_clock_write(sec, RTC_SECONDS); 115 115 maple_clock_write(min, RTC_MINUTES);