From: Matt Mackall <mpm@selenic.com>

Fix up some RTC whitespace and style

Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/ppc/platforms/chrp_time.c            |   22 ++++++++++---------
 arch/sh/boards/mpc1211/rtc.c              |   23 +++++++++++---------
 include/asm-i386/mach-default/mach_time.h |   21 +++++++++---------
 3 files changed, 36 insertions(+), 30 deletions(-)

diff -puN arch/ppc/platforms/chrp_time.c~rtc-fix-up-some-rtc-whitespace-and-style arch/ppc/platforms/chrp_time.c
--- devel/arch/ppc/platforms/chrp_time.c~rtc-fix-up-some-rtc-whitespace-and-style	2006-03-17 22:01:36.000000000 -0800
+++ devel-akpm/arch/ppc/platforms/chrp_time.c	2006-03-17 22:01:36.000000000 -0800
@@ -129,16 +129,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);
 }
diff -puN arch/sh/boards/mpc1211/rtc.c~rtc-fix-up-some-rtc-whitespace-and-style arch/sh/boards/mpc1211/rtc.c
--- devel/arch/sh/boards/mpc1211/rtc.c~rtc-fix-up-some-rtc-whitespace-and-style	2006-03-17 22:01:36.000000000 -0800
+++ devel-akpm/arch/sh/boards/mpc1211/rtc.c	2006-03-17 22:01:36.000000000 -0800
@@ -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);
 }
 
diff -puN include/asm-i386/mach-default/mach_time.h~rtc-fix-up-some-rtc-whitespace-and-style include/asm-i386/mach-default/mach_time.h
--- devel/include/asm-i386/mach-default/mach_time.h~rtc-fix-up-some-rtc-whitespace-and-style	2006-03-17 22:01:36.000000000 -0800
+++ devel-akpm/include/asm-i386/mach-default/mach_time.h	2006-03-17 22:01:36.000000000 -0800
@@ -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);
_