diff options
| author | Simon Glass <sjg@chromium.org> | 2015-04-20 12:37:19 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-05-05 20:58:20 -0600 |
| commit | 714209832db1064886680b138f1abf9ce235b2c3 (patch) | |
| tree | 6a786a91f13c0e154fb9f6a3068229ad1d2f5326 /drivers/rtc/date.c | |
| parent | 9f9276c34cbbf67fd1b3788f0be326b47fc69123 (diff) | |
| download | blackbird-obmc-uboot-714209832db1064886680b138f1abf9ce235b2c3.tar.gz blackbird-obmc-uboot-714209832db1064886680b138f1abf9ce235b2c3.zip | |
dm: rtc: Rename mktime() and reduce the number of parameters
Most callers unpack the structure and pass each member. It seems better to
pass the whole structure instead, as with the C library. Also add an rtc_
prefix.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'drivers/rtc/date.c')
| -rw-r--r-- | drivers/rtc/date.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/rtc/date.c b/drivers/rtc/date.c index 79beb940e5..8c643a0b46 100644 --- a/drivers/rtc/date.c +++ b/drivers/rtc/date.c @@ -128,22 +128,23 @@ int rtc_to_tm(int tim, struct rtc_time *tm) * machines were long is 32-bit! (However, as time_t is signed, we * will already get problems at other places on 2038-01-19 03:14:08) */ -unsigned long -mktime (unsigned int year, unsigned int mon, - unsigned int day, unsigned int hour, - unsigned int min, unsigned int sec) +unsigned long rtc_mktime(const struct rtc_time *tm) { - if (0 >= (int) (mon -= 2)) { /* 1..12 -> 11,12,1..10 */ + int mon = tm->tm_mon; + int year = tm->tm_year; + int days, hours; + + mon -= 2; + if (0 >= (int)mon) { /* 1..12 -> 11,12,1..10 */ mon += 12; /* Puts Feb last since it has leap day */ year -= 1; } - return ((( - (unsigned long) (year/4 - year/100 + year/400 + 367*mon/12 + day) + - year*365 - 719499 - )*24 + hour /* now have hours */ - )*60 + min /* now have minutes */ - )*60 + sec; /* finally seconds */ + days = (unsigned long)(year / 4 - year / 100 + year / 400 + + 367 * mon / 12 + tm->tm_mday) + + year * 365 - 719499; + hours = days * 24 + tm->tm_hour; + return (hours * 60 + tm->tm_min) * 60 + tm->tm_sec; } #endif |
