From: Matt Mackall <mpm@selenic.com>
To: Andrew Morton <akpm@osdl.org>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 13/14] RTC: Fix up some RTC whitespace and style
Date: Fri, 17 Mar 2006 17:30:37 -0600 [thread overview]
Message-ID: <14.132654658@selenic.com> (raw)
In-Reply-To: <2.132654658@selenic.com>
Fix up some RTC whitespace and style
Signed-off-by: Matt Mackall <mpm@selenic.com>
Index: rtc/arch/sh/boards/mpc1211/rtc.c
===================================================================
--- rtc.orig/arch/sh/boards/mpc1211/rtc.c 2006-03-16 17:23:39.000000000 -0600
+++ rtc/arch/sh/boards/mpc1211/rtc.c 2006-03-17 11:50:08.000000000 -0600
@@ -34,18 +34,21 @@ unsigned long get_cmos_time(void)
year = CMOS_READ(RTC_YEAR);
} while (sec != CMOS_READ(RTC_SECONDS));
- 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);
- }
+ 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);
+ }
+
spin_unlock(&rtc_lock);
- if ((year += 1900) < 1970)
+
+ year += 1900;
+ if (year < 1970)
year += 100;
+
return mktime(year, mon, day, hour, min, sec);
}
Index: rtc/include/asm-i386/mach-default/mach_time.h
===================================================================
--- rtc.orig/include/asm-i386/mach-default/mach_time.h 2006-03-16 17:23:39.000000000 -0600
+++ rtc/include/asm-i386/mach-default/mach_time.h 2006-03-16 19:05:41.000000000 -0600
@@ -92,16 +92,17 @@ static inline unsigned long mach_get_cmo
year = CMOS_READ(RTC_YEAR);
} while (sec != CMOS_READ(RTC_SECONDS));
- 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);
- }
- if ((year += 1900) < 1970)
+ 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);
+ }
+
+ year += 1900;
+ if (year < 1970)
year += 100;
return mktime(year, mon, day, hour, min, sec);
Index: rtc/arch/ppc/platforms/chrp_time.c
===================================================================
--- rtc.orig/arch/ppc/platforms/chrp_time.c 2006-03-16 17:21:23.000000000 -0600
+++ rtc/arch/ppc/platforms/chrp_time.c 2006-03-16 19:08:38.000000000 -0600
@@ -131,16 +131,18 @@ unsigned long chrp_get_rtc_time(void)
year = chrp_cmos_clock_read(RTC_YEAR);
} while (sec != chrp_cmos_clock_read(RTC_SECONDS));
- if (!(chrp_cmos_clock_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);
- }
- if ((year += 1900) < 1970)
+ if (!(chrp_cmos_clock_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);
+ }
+
+ year += 1900;
+ if (year < 1970)
year += 100;
return mktime(year, mon, day, hour, min, sec);
}
next prev parent reply other threads:[~2006-03-17 23:59 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-17 23:30 [PATCH 1/14] RTC: Remove RTC UIP synchronization on x86 Matt Mackall
2006-03-17 23:30 ` [PATCH 3/14] RTC: Remove RTC UIP synchronization on Sparc64 Matt Mackall
2006-03-17 23:30 ` [PATCH 2/14] RTC: Remove RTC UIP synchronization on x86_64 Matt Mackall
2006-03-18 5:52 ` Andrew Morton
2006-03-18 14:16 ` Matt Mackall
2006-03-17 23:30 ` [PATCH 4/14] RTC: Remove RTC UIP synchronization on PPC CHRP (arch/ppc) Matt Mackall
2006-03-17 23:30 ` [PATCH 7/14] RTC: Remove RTC UIP synchronization on MIPS Footbridge Matt Mackall
2006-03-17 23:58 ` Matt Mackall
2006-03-17 23:30 ` [PATCH 5/14] RTC: Remove RTC UIP synchronization on CHRP (arch/powerpc) Matt Mackall
2006-03-17 23:30 ` [PATCH 6/14] RTC: Remove RTC UIP synchronization on PPC Maple Matt Mackall
2006-03-17 23:30 ` [PATCH 8/14] RTC: Remove RTC UIP synchronization on MIPS MC146818 Matt Mackall
2006-03-17 23:30 ` [PATCH 9/14] RTC: Remove RTC UIP synchronization on MIPS-based DEC Matt Mackall
2006-03-17 23:30 ` [PATCH 12/14] RTC: Remove RTC UIP synchronization on Alpha Matt Mackall
2006-03-17 23:30 ` Matt Mackall [this message]
2006-03-17 23:30 ` [PATCH 10/14] RTC: Remove RTC UIP synchronization on SH03 Matt Mackall
2006-03-17 23:30 ` [PATCH 11/14] RTC: Remove RTC UIP synchronization on SH MPC1211 Matt Mackall
2006-03-17 23:30 ` [PATCH 14/14] RTC: Remove some duplicate BCD definitions Matt Mackall
2006-03-18 5:53 ` Andrew Morton
2006-03-19 18:13 ` [PATCH 1/14] RTC: Remove RTC UIP synchronization on x86 Pavel Machek
2006-03-21 16:38 ` Matt Mackall
2006-03-21 18:40 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=14.132654658@selenic.com \
--to=mpm@selenic.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox