Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 41623b064fbd76de5901da7c0e3cd2136617d787

Authored by Matt Mackall
Committed by Linus Torvalds
1 parent 4c2e6f6a06
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] RTC: Fix up some RTC whitespace and style 

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 36 additions and 30 deletions Side-by-side Diff

arch/ppc/platforms/chrp_time.c
Diff comments   View file @ 41623b0
... ... @@ -129,16 +129,18 @@
129 129 year = chrp_cmos_clock_read(RTC_YEAR);
130 130 } while (sec != chrp_cmos_clock_read(RTC_SECONDS));
131 131  
132   - if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
133   - {
134   - BCD_TO_BIN(sec);
135   - BCD_TO_BIN(min);
136   - BCD_TO_BIN(hour);
137   - BCD_TO_BIN(day);
138   - BCD_TO_BIN(mon);
139   - BCD_TO_BIN(year);
140   - }
141   - if ((year += 1900) < 1970)
  132 + if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY)
  133 + || RTC_ALWAYS_BCD) {
  134 + BCD_TO_BIN(sec);
  135 + BCD_TO_BIN(min);
  136 + BCD_TO_BIN(hour);
  137 + BCD_TO_BIN(day);
  138 + BCD_TO_BIN(mon);
  139 + BCD_TO_BIN(year);
  140 + }
  141 +
  142 + year += 1900;
  143 + if (year < 1970)
142 144 year += 100;
143 145 return mktime(year, mon, day, hour, min, sec);
144 146 }
arch/sh/boards/mpc1211/rtc.c
Diff comments   View file @ 41623b0
... ... @@ -34,18 +34,21 @@
34 34 year = CMOS_READ(RTC_YEAR);
35 35 } while (sec != CMOS_READ(RTC_SECONDS));
36 36  
37   - if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
38   - {
39   - BCD_TO_BIN(sec);
40   - BCD_TO_BIN(min);
41   - BCD_TO_BIN(hour);
42   - BCD_TO_BIN(day);
43   - BCD_TO_BIN(mon);
44   - BCD_TO_BIN(year);
45   - }
  37 + if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
  38 + BCD_TO_BIN(sec);
  39 + BCD_TO_BIN(min);
  40 + BCD_TO_BIN(hour);
  41 + BCD_TO_BIN(day);
  42 + BCD_TO_BIN(mon);
  43 + BCD_TO_BIN(year);
  44 + }
  45 +
46 46 spin_unlock(&rtc_lock);
47   - if ((year += 1900) < 1970)
  47 +
  48 + year += 1900;
  49 + if (year < 1970)
48 50 year += 100;
  51 +
49 52 return mktime(year, mon, day, hour, min, sec);
50 53 }
51 54  
include/asm-i386/mach-default/mach_time.h
Diff comments   View file @ 41623b0
... ... @@ -92,16 +92,17 @@
92 92 year = CMOS_READ(RTC_YEAR);
93 93 } while (sec != CMOS_READ(RTC_SECONDS));
94 94  
95   - if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
96   - {
97   - BCD_TO_BIN(sec);
98   - BCD_TO_BIN(min);
99   - BCD_TO_BIN(hour);
100   - BCD_TO_BIN(day);
101   - BCD_TO_BIN(mon);
102   - BCD_TO_BIN(year);
103   - }
104   - if ((year += 1900) < 1970)
  95 + if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
  96 + BCD_TO_BIN(sec);
  97 + BCD_TO_BIN(min);
  98 + BCD_TO_BIN(hour);
  99 + BCD_TO_BIN(day);
  100 + BCD_TO_BIN(mon);
  101 + BCD_TO_BIN(year);
  102 + }
  103 +
  104 + year += 1900;
  105 + if (year < 1970)
105 106 year += 100;
106 107  
107 108 return mktime(year, mon, day, hour, min, sec);