git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EEPROM: 93cx6: Header file cleanup
[safe/jmp/linux-2.6]
/
drivers
/
rtc
/
rtc-lib.c
diff --git
a/drivers/rtc/rtc-lib.c
b/drivers/rtc/rtc-lib.c
index
9812120
..
773851f
100644
(file)
--- a/
drivers/rtc/rtc-lib.c
+++ b/
drivers/rtc/rtc-lib.c
@@
-26,14
+26,13
@@
static const unsigned short rtc_ydays[2][13] = {
};
#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
};
#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
-#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400))
/*
* The number of days in the month.
*/
int rtc_month_days(unsigned int month, unsigned int year)
{
/*
* The number of days in the month.
*/
int rtc_month_days(unsigned int month, unsigned int year)
{
- return rtc_days_in_month[month] + (
LEAP_YEAR
(year) && month == 1);
+ return rtc_days_in_month[month] + (
is_leap_year
(year) && month == 1);
}
EXPORT_SYMBOL(rtc_month_days);
}
EXPORT_SYMBOL(rtc_month_days);
@@
-42,7
+41,7
@@
EXPORT_SYMBOL(rtc_month_days);
*/
int rtc_year_days(unsigned int day, unsigned int month, unsigned int year)
{
*/
int rtc_year_days(unsigned int day, unsigned int month, unsigned int year)
{
- return rtc_ydays[
LEAP_YEAR
(year)][month] + day-1;
+ return rtc_ydays[
is_leap_year
(year)][month] + day-1;
}
EXPORT_SYMBOL(rtc_year_days);
}
EXPORT_SYMBOL(rtc_year_days);
@@
-51,10
+50,11
@@
EXPORT_SYMBOL(rtc_year_days);
*/
void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
{
*/
void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
{
- register int days, month, year;
+ unsigned int month, year;
+ int days;
days = time / 86400;
days = time / 86400;
- time -= days * 86400;
+ time -=
(unsigned int)
days * 86400;
/* day of the week, 1970-01-01 was a Thursday */
tm->tm_wday = (days + 4) % 7;
/* day of the week, 1970-01-01 was a Thursday */
tm->tm_wday = (days + 4) % 7;
@@
-65,7
+65,7
@@
void rtc_time_to_tm(unsigned long time, struct rtc_time *tm)
- LEAPS_THRU_END_OF(1970 - 1);
if (days < 0) {
year -= 1;
- LEAPS_THRU_END_OF(1970 - 1);
if (days < 0) {
year -= 1;
- days += 365 +
LEAP_YEAR
(year);
+ days += 365 +
is_leap_year
(year);
}
tm->tm_year = year - 1900;
tm->tm_yday = days + 1;
}
tm->tm_year = year - 1900;
tm->tm_yday = days + 1;
@@
-94,12
+94,12
@@
EXPORT_SYMBOL(rtc_time_to_tm);
int rtc_valid_tm(struct rtc_time *tm)
{
if (tm->tm_year < 70
int rtc_valid_tm(struct rtc_time *tm)
{
if (tm->tm_year < 70
- ||
tm->tm_mon
>= 12
+ ||
((unsigned)tm->tm_mon)
>= 12
|| tm->tm_mday < 1
|| tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900)
|| tm->tm_mday < 1
|| tm->tm_mday > rtc_month_days(tm->tm_mon, tm->tm_year + 1900)
- ||
tm->tm_hour
>= 24
- ||
tm->tm_min
>= 60
- ||
tm->tm_sec
>= 60)
+ ||
((unsigned)tm->tm_hour)
>= 24
+ ||
((unsigned)tm->tm_min)
>= 60
+ ||
((unsigned)tm->tm_sec)
>= 60)
return -EINVAL;
return 0;
return -EINVAL;
return 0;