Skip to content

L
linux
Commit 4110a0d6 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files
Options

cris: use bcd2bin/bin2bcd 

Change cris 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: Chris Zankel <zankel@tensilica.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 18b1bd05
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 45 deletions
arch/cris/arch-v10/drivers/ds1302.c
View file @ 4110a0d6
...@@ -215,12 +215,12 @@ get_rtc_time(struct rtc_time *rtc_tm) ...@@ -215,12 +215,12 @@ get_rtc_time(struct rtc_time *rtc_tm)
local_irq_restore(flags); local_irq_restore(flags);
BCD_TO_BIN(rtc_tm->tm_sec); rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);
BCD_TO_BIN(rtc_tm->tm_min); rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);
BCD_TO_BIN(rtc_tm->tm_hour); rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
BCD_TO_BIN(rtc_tm->tm_mday); rtc_tm->tm_mday = bcd2bin(rtc_tm->tm_mday);
BCD_TO_BIN(rtc_tm->tm_mon); rtc_tm->tm_mon = bcd2bin(rtc_tm->tm_mon);
BCD_TO_BIN(rtc_tm->tm_year); rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);
/* /*
* Account for differences between how the RTC uses the values * Account for differences between how the RTC uses the values
...@@ -295,12 +295,12 @@ rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -295,12 +295,12 @@ rtc_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
else else
yrs -= 1900; /* RTC (70, 71, ... 99) */ yrs -= 1900; /* RTC (70, 71, ... 99) */
BIN_TO_BCD(sec); sec = bin2bcd(sec);
BIN_TO_BCD(min); min = bin2bcd(min);
BIN_TO_BCD(hrs); hrs = bin2bcd(hrs);
BIN_TO_BCD(day); day = bin2bcd(day);
BIN_TO_BCD(mon); mon = bin2bcd(mon);
BIN_TO_BCD(yrs); yrs = bin2bcd(yrs);
local_irq_save(flags); local_irq_save(flags);
CMOS_WRITE(yrs, RTC_YEAR); CMOS_WRITE(yrs, RTC_YEAR);
......
arch/cris/arch-v10/drivers/pcf8563.c
View file @ 4110a0d6
...@@ -122,7 +122,7 @@ get_rtc_time(struct rtc_time *tm) ...@@ -122,7 +122,7 @@ get_rtc_time(struct rtc_time *tm)
"information is no longer guaranteed!\n", PCF8563_NAME); "information is no longer guaranteed!\n", PCF8563_NAME);
} }
tm->tm_year = BCD_TO_BIN(tm->tm_year) + tm->tm_year = bcd2bin(tm->tm_year) +
((tm->tm_mon & 0x80) ? 100 : 0); ((tm->tm_mon & 0x80) ? 100 : 0);
tm->tm_sec &= 0x7F; tm->tm_sec &= 0x7F;
tm->tm_min &= 0x7F; tm->tm_min &= 0x7F;
...@@ -131,11 +131,11 @@ get_rtc_time(struct rtc_time *tm) ...@@ -131,11 +131,11 @@ get_rtc_time(struct rtc_time *tm)
tm->tm_wday &= 0x07; /* Not coded in BCD. */ tm->tm_wday &= 0x07; /* Not coded in BCD. */
tm->tm_mon &= 0x1F; tm->tm_mon &= 0x1F;
BCD_TO_BIN(tm->tm_sec); tm->tm_sec = bcd2bin(tm->tm_sec);
BCD_TO_BIN(tm->tm_min); tm->tm_min = bcd2bin(tm->tm_min);
BCD_TO_BIN(tm->tm_hour); tm->tm_hour = bcd2bin(tm->tm_hour);
BCD_TO_BIN(tm->tm_mday); tm->tm_mday = bcd2bin(tm->tm_mday);
BCD_TO_BIN(tm->tm_mon); tm->tm_mon = bcd2bin(tm->tm_mon);
tm->tm_mon--; /* Month is 1..12 in RTC but 0..11 in linux */ tm->tm_mon--; /* Month is 1..12 in RTC but 0..11 in linux */
} }
...@@ -282,12 +282,12 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, ...@@ -282,12 +282,12 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
century = (tm.tm_year >= 2000) ? 0x80 : 0; century = (tm.tm_year >= 2000) ? 0x80 : 0;
tm.tm_year = tm.tm_year % 100; tm.tm_year = tm.tm_year % 100;
BIN_TO_BCD(tm.tm_year); tm.tm_year = bin2bcd(tm.tm_year);
BIN_TO_BCD(tm.tm_mon); tm.tm_mon = bin2bcd(tm.tm_mon);
BIN_TO_BCD(tm.tm_mday); tm.tm_mday = bin2bcd(tm.tm_mday);
BIN_TO_BCD(tm.tm_hour); tm.tm_hour = bin2bcd(tm.tm_hour);
BIN_TO_BCD(tm.tm_min); tm.tm_min = bin2bcd(tm.tm_min);
BIN_TO_BCD(tm.tm_sec); tm.tm_sec = bin2bcd(tm.tm_sec);
tm.tm_mon |= century; tm.tm_mon |= century;
mutex_lock(&rtc_lock); mutex_lock(&rtc_lock);
......
arch/cris/arch-v32/drivers/pcf8563.c
View file @ 4110a0d6
...@@ -118,7 +118,7 @@ get_rtc_time(struct rtc_time *tm) ...@@ -118,7 +118,7 @@ get_rtc_time(struct rtc_time *tm)
"information is no longer guaranteed!\n", PCF8563_NAME); "information is no longer guaranteed!\n", PCF8563_NAME);
} }
tm->tm_year = BCD_TO_BIN(tm->tm_year) + tm->tm_year = bcd2bin(tm->tm_year) +
((tm->tm_mon & 0x80) ? 100 : 0); ((tm->tm_mon & 0x80) ? 100 : 0);
tm->tm_sec &= 0x7F; tm->tm_sec &= 0x7F;
tm->tm_min &= 0x7F; tm->tm_min &= 0x7F;
...@@ -127,11 +127,11 @@ get_rtc_time(struct rtc_time *tm) ...@@ -127,11 +127,11 @@ get_rtc_time(struct rtc_time *tm)
tm->tm_wday &= 0x07; /* Not coded in BCD. */ tm->tm_wday &= 0x07; /* Not coded in BCD. */
tm->tm_mon &= 0x1F; tm->tm_mon &= 0x1F;
BCD_TO_BIN(tm->tm_sec); tm->tm_sec = bcd2bin(tm->tm_sec);
BCD_TO_BIN(tm->tm_min); tm->tm_min = bcd2bin(tm->tm_min);
BCD_TO_BIN(tm->tm_hour); tm->tm_hour = bcd2bin(tm->tm_hour);
BCD_TO_BIN(tm->tm_mday); tm->tm_mday = bcd2bin(tm->tm_mday);
BCD_TO_BIN(tm->tm_mon); tm->tm_mon = bcd2bin(tm->tm_mon);
tm->tm_mon--; /* Month is 1..12 in RTC but 0..11 in linux */ tm->tm_mon--; /* Month is 1..12 in RTC but 0..11 in linux */
} }
...@@ -279,12 +279,12 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, ...@@ -279,12 +279,12 @@ int pcf8563_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
century = (tm.tm_year >= 2000) ? 0x80 : 0; century = (tm.tm_year >= 2000) ? 0x80 : 0;
tm.tm_year = tm.tm_year % 100; tm.tm_year = tm.tm_year % 100;
BIN_TO_BCD(tm.tm_year); tm.tm_year = bin2bcd(tm.tm_year);
BIN_TO_BCD(tm.tm_mon); tm.tm_mon = bin2bcd(tm.tm_mon);
BIN_TO_BCD(tm.tm_mday); tm.tm_mday = bin2bcd(tm.tm_mday);
BIN_TO_BCD(tm.tm_hour); tm.tm_hour = bin2bcd(tm.tm_hour);
BIN_TO_BCD(tm.tm_min); tm.tm_min = bin2bcd(tm.tm_min);
BIN_TO_BCD(tm.tm_sec); tm.tm_sec = bin2bcd(tm.tm_sec);
tm.tm_mon |= century; tm.tm_mon |= century;
mutex_lock(&rtc_lock); mutex_lock(&rtc_lock);
......
arch/cris/kernel/time.c
View file @ 4110a0d6
...@@ -127,7 +127,7 @@ int set_rtc_mmss(unsigned long nowtime) ...@@ -127,7 +127,7 @@ int set_rtc_mmss(unsigned long nowtime)
return 0; return 0;
cmos_minutes = CMOS_READ(RTC_MINUTES); cmos_minutes = CMOS_READ(RTC_MINUTES);
BCD_TO_BIN(cmos_minutes); cmos_minutes = bcd2bin(cmos_minutes);
/* /*
* since we're only adjusting minutes and seconds, * since we're only adjusting minutes and seconds,
...@@ -142,8 +142,8 @@ int set_rtc_mmss(unsigned long nowtime) ...@@ -142,8 +142,8 @@ int set_rtc_mmss(unsigned long nowtime)
real_minutes %= 60; real_minutes %= 60;
if (abs(real_minutes - cmos_minutes) < 30) { if (abs(real_minutes - cmos_minutes) < 30) {
BIN_TO_BCD(real_seconds); real_seconds = bin2bcd(real_seconds);
BIN_TO_BCD(real_minutes); real_minutes = bin2bcd(real_minutes);
CMOS_WRITE(real_seconds,RTC_SECONDS); CMOS_WRITE(real_seconds,RTC_SECONDS);
CMOS_WRITE(real_minutes,RTC_MINUTES); CMOS_WRITE(real_minutes,RTC_MINUTES);
} else { } else {
...@@ -170,12 +170,12 @@ get_cmos_time(void) ...@@ -170,12 +170,12 @@ get_cmos_time(void)
mon = CMOS_READ(RTC_MONTH); mon = CMOS_READ(RTC_MONTH);
year = CMOS_READ(RTC_YEAR); year = CMOS_READ(RTC_YEAR);
BCD_TO_BIN(sec); sec = bcd2bin(sec);
BCD_TO_BIN(min); min = bcd2bin(min);
BCD_TO_BIN(hour); hour = bcd2bin(hour);
BCD_TO_BIN(day); day = bcd2bin(day);
BCD_TO_BIN(mon); mon = bcd2bin(mon);
BCD_TO_BIN(year); year = bcd2bin(year);
if ((year += 1900) < 1970) if ((year += 1900) < 1970)
year += 100; year += 100;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7