Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 02112dbc925f664bc4d24ff098686b9d21bfbfb1

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent e232cfdc3d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

mips: use bcd2bin/bin2bcd 

Changes mips to use the new bcd2bin/bin2bcd functions instead of the
obsolete BCD_TO_BIN/BIN_TO_BCD/BCD2BIN/BIN2BCD macros.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 5 changed files with 59 additions and 59 deletions Side-by-side Diff

arch/mips/dec/time.c
Diff comments   View file @ 02112db
... ... @@ -45,12 +45,12 @@
45 45 spin_unlock_irqrestore(&rtc_lock, flags);
46 46  
47 47 if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
48   - sec = BCD2BIN(sec);
49   - min = BCD2BIN(min);
50   - hour = BCD2BIN(hour);
51   - day = BCD2BIN(day);
52   - mon = BCD2BIN(mon);
53   - year = BCD2BIN(year);
  48 + sec = bcd2bin(sec);
  49 + min = bcd2bin(min);
  50 + hour = bcd2bin(hour);
  51 + day = bcd2bin(day);
  52 + mon = bcd2bin(mon);
  53 + year = bcd2bin(year);
54 54 }
55 55  
56 56 year += real_year - 72 + 2000;
... ... @@ -83,7 +83,7 @@
83 83  
84 84 cmos_minutes = CMOS_READ(RTC_MINUTES);
85 85 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
86   - cmos_minutes = BCD2BIN(cmos_minutes);
  86 + cmos_minutes = bcd2bin(cmos_minutes);
87 87  
88 88 /*
89 89 * since we're only adjusting minutes and seconds,
... ... @@ -99,8 +99,8 @@
99 99  
100 100 if (abs(real_minutes - cmos_minutes) < 30) {
101 101 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
102   - real_seconds = BIN2BCD(real_seconds);
103   - real_minutes = BIN2BCD(real_minutes);
  102 + real_seconds = bin2bcd(real_seconds);
  103 + real_minutes = bin2bcd(real_minutes);
104 104 }
105 105 CMOS_WRITE(real_seconds, RTC_SECONDS);
106 106 CMOS_WRITE(real_minutes, RTC_MINUTES);
arch/mips/include/asm/mc146818-time.h
Diff comments   View file @ 02112db
... ... @@ -44,7 +44,7 @@
44 44  
45 45 cmos_minutes = CMOS_READ(RTC_MINUTES);
46 46 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
47   - BCD_TO_BIN(cmos_minutes);
  47 + cmos_minutes = bcd2bin(cmos_minutes);
48 48  
49 49 /*
50 50 * since we're only adjusting minutes and seconds,
... ... @@ -60,8 +60,8 @@
60 60  
61 61 if (abs(real_minutes - cmos_minutes) < 30) {
62 62 if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
63   - BIN_TO_BCD(real_seconds);
64   - BIN_TO_BCD(real_minutes);
  63 + real_seconds = bin2bcd(real_seconds);
  64 + real_minutes = bin2bcd(real_minutes);
65 65 }
66 66 CMOS_WRITE(real_seconds, RTC_SECONDS);
67 67 CMOS_WRITE(real_minutes, RTC_MINUTES);
... ... @@ -103,12 +103,12 @@
103 103 } while (sec != CMOS_READ(RTC_SECONDS));
104 104  
105 105 if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
106   - BCD_TO_BIN(sec);
107   - BCD_TO_BIN(min);
108   - BCD_TO_BIN(hour);
109   - BCD_TO_BIN(day);
110   - BCD_TO_BIN(mon);
111   - BCD_TO_BIN(year);
  106 + sec = bcd2bin(sec);
  107 + min = bcd2bin(min);
  108 + hour = bcd2bin(hour);
  109 + day = bcd2bin(day);
  110 + mon = bcd2bin(mon);
  111 + year = bcd2bin(year);
112 112 }
113 113 spin_unlock_irqrestore(&rtc_lock, flags);
114 114 year = mc146818_decode_year(year);
arch/mips/pmc-sierra/yosemite/setup.c
Diff comments   View file @ 02112db
... ... @@ -79,14 +79,14 @@
79 79 /* Stop the update to the time */
80 80 m48t37_base->control = 0x40;
81 81  
82   - year = BCD2BIN(m48t37_base->year);
83   - year += BCD2BIN(m48t37_base->century) * 100;
  82 + year = bcd2bin(m48t37_base->year);
  83 + year += bcd2bin(m48t37_base->century) * 100;
84 84  
85   - month = BCD2BIN(m48t37_base->month);
86   - day = BCD2BIN(m48t37_base->date);
87   - hour = BCD2BIN(m48t37_base->hour);
88   - min = BCD2BIN(m48t37_base->min);
89   - sec = BCD2BIN(m48t37_base->sec);
  85 + month = bcd2bin(m48t37_base->month);
  86 + day = bcd2bin(m48t37_base->date);
  87 + hour = bcd2bin(m48t37_base->hour);
  88 + min = bcd2bin(m48t37_base->min);
  89 + sec = bcd2bin(m48t37_base->sec);
90 90  
91 91 /* Start the update to the time again */
92 92 m48t37_base->control = 0x00;
93 93  
94 94  
95 95  
96 96  
... ... @@ -113,22 +113,22 @@
113 113 m48t37_base->control = 0x80;
114 114  
115 115 /* year */
116   - m48t37_base->year = BIN2BCD(tm.tm_year % 100);
117   - m48t37_base->century = BIN2BCD(tm.tm_year / 100);
  116 + m48t37_base->year = bin2bcd(tm.tm_year % 100);
  117 + m48t37_base->century = bin2bcd(tm.tm_year / 100);
118 118  
119 119 /* month */
120   - m48t37_base->month = BIN2BCD(tm.tm_mon);
  120 + m48t37_base->month = bin2bcd(tm.tm_mon);
121 121  
122 122 /* day */
123   - m48t37_base->date = BIN2BCD(tm.tm_mday);
  123 + m48t37_base->date = bin2bcd(tm.tm_mday);
124 124  
125 125 /* hour/min/sec */
126   - m48t37_base->hour = BIN2BCD(tm.tm_hour);
127   - m48t37_base->min = BIN2BCD(tm.tm_min);
128   - m48t37_base->sec = BIN2BCD(tm.tm_sec);
  126 + m48t37_base->hour = bin2bcd(tm.tm_hour);
  127 + m48t37_base->min = bin2bcd(tm.tm_min);
  128 + m48t37_base->sec = bin2bcd(tm.tm_sec);
129 129  
130 130 /* day of week -- not really used, but let's keep it up-to-date */
131   - m48t37_base->day = BIN2BCD(tm.tm_wday + 1);
  131 + m48t37_base->day = bin2bcd(tm.tm_wday + 1);
132 132  
133 133 /* disable writing */
134 134 m48t37_base->control = 0x00;
arch/mips/sibyte/swarm/rtc_m41t81.c
Diff comments   View file @ 02112db
... ... @@ -156,32 +156,32 @@
156 156 */
157 157  
158 158 spin_lock_irqsave(&rtc_lock, flags);
159   - tm.tm_sec = BIN2BCD(tm.tm_sec);
  159 + tm.tm_sec = bin2bcd(tm.tm_sec);
160 160 m41t81_write(M41T81REG_SC, tm.tm_sec);
161 161  
162   - tm.tm_min = BIN2BCD(tm.tm_min);
  162 + tm.tm_min = bin2bcd(tm.tm_min);
163 163 m41t81_write(M41T81REG_MN, tm.tm_min);
164 164  
165   - tm.tm_hour = BIN2BCD(tm.tm_hour);
  165 + tm.tm_hour = bin2bcd(tm.tm_hour);
166 166 tm.tm_hour = (tm.tm_hour & 0x3f) | (m41t81_read(M41T81REG_HR) & 0xc0);
167 167 m41t81_write(M41T81REG_HR, tm.tm_hour);
168 168  
169 169 /* tm_wday starts from 0 to 6 */
170 170 if (tm.tm_wday == 0) tm.tm_wday = 7;
171   - tm.tm_wday = BIN2BCD(tm.tm_wday);
  171 + tm.tm_wday = bin2bcd(tm.tm_wday);
172 172 m41t81_write(M41T81REG_DY, tm.tm_wday);
173 173  
174   - tm.tm_mday = BIN2BCD(tm.tm_mday);
  174 + tm.tm_mday = bin2bcd(tm.tm_mday);
175 175 m41t81_write(M41T81REG_DT, tm.tm_mday);
176 176  
177 177 /* tm_mon starts from 0, *ick* */
178 178 tm.tm_mon ++;
179   - tm.tm_mon = BIN2BCD(tm.tm_mon);
  179 + tm.tm_mon = bin2bcd(tm.tm_mon);
180 180 m41t81_write(M41T81REG_MO, tm.tm_mon);
181 181  
182 182 /* we don't do century, everything is beyond 2000 */
183 183 tm.tm_year %= 100;
184   - tm.tm_year = BIN2BCD(tm.tm_year);
  184 + tm.tm_year = bin2bcd(tm.tm_year);
185 185 m41t81_write(M41T81REG_YR, tm.tm_year);
186 186 spin_unlock_irqrestore(&rtc_lock, flags);
187 187  
... ... @@ -209,12 +209,12 @@
209 209 year = m41t81_read(M41T81REG_YR);
210 210 spin_unlock_irqrestore(&rtc_lock, flags);
211 211  
212   - sec = BCD2BIN(sec);
213   - min = BCD2BIN(min);
214   - hour = BCD2BIN(hour);
215   - day = BCD2BIN(day);
216   - mon = BCD2BIN(mon);
217   - year = BCD2BIN(year);
  212 + sec = bcd2bin(sec);
  213 + min = bcd2bin(min);
  214 + hour = bcd2bin(hour);
  215 + day = bcd2bin(day);
  216 + mon = bcd2bin(mon);
  217 + year = bcd2bin(year);
218 218  
219 219 year += 2000;
220 220  
arch/mips/sibyte/swarm/rtc_xicor1241.c
Diff comments   View file @ 02112db
... ... @@ -124,18 +124,18 @@
124 124 xicor_write(X1241REG_SR, X1241REG_SR_WEL | X1241REG_SR_RWEL);
125 125  
126 126 /* trivial ones */
127   - tm.tm_sec = BIN2BCD(tm.tm_sec);
  127 + tm.tm_sec = bin2bcd(tm.tm_sec);
128 128 xicor_write(X1241REG_SC, tm.tm_sec);
129 129  
130   - tm.tm_min = BIN2BCD(tm.tm_min);
  130 + tm.tm_min = bin2bcd(tm.tm_min);
131 131 xicor_write(X1241REG_MN, tm.tm_min);
132 132  
133   - tm.tm_mday = BIN2BCD(tm.tm_mday);
  133 + tm.tm_mday = bin2bcd(tm.tm_mday);
134 134 xicor_write(X1241REG_DT, tm.tm_mday);
135 135  
136 136 /* tm_mon starts from 0, *ick* */
137 137 tm.tm_mon ++;
138   - tm.tm_mon = BIN2BCD(tm.tm_mon);
  138 + tm.tm_mon = bin2bcd(tm.tm_mon);
139 139 xicor_write(X1241REG_MO, tm.tm_mon);
140 140  
141 141 /* year is split */
... ... @@ -148,7 +148,7 @@
148 148 tmp = xicor_read(X1241REG_HR);
149 149 if (tmp & X1241REG_HR_MIL) {
150 150 /* 24 hour format */
151   - tm.tm_hour = BIN2BCD(tm.tm_hour);
  151 + tm.tm_hour = bin2bcd(tm.tm_hour);
152 152 tmp = (tmp & ~0x3f) | (tm.tm_hour & 0x3f);
153 153 } else {
154 154 /* 12 hour format, with 0x2 for pm */
... ... @@ -157,7 +157,7 @@
157 157 tmp |= 0x20;
158 158 tm.tm_hour -= 12;
159 159 }
160   - tm.tm_hour = BIN2BCD(tm.tm_hour);
  160 + tm.tm_hour = bin2bcd(tm.tm_hour);
161 161 tmp |= tm.tm_hour;
162 162 }
163 163 xicor_write(X1241REG_HR, tmp);
... ... @@ -191,13 +191,13 @@
191 191 y2k = xicor_read(X1241REG_Y2K);
192 192 spin_unlock_irqrestore(&rtc_lock, flags);
193 193  
194   - sec = BCD2BIN(sec);
195   - min = BCD2BIN(min);
196   - hour = BCD2BIN(hour);
197   - day = BCD2BIN(day);
198   - mon = BCD2BIN(mon);
199   - year = BCD2BIN(year);
200   - y2k = BCD2BIN(y2k);
  194 + sec = bcd2bin(sec);
  195 + min = bcd2bin(min);
  196 + hour = bcd2bin(hour);
  197 + day = bcd2bin(day);
  198 + mon = bcd2bin(mon);
  199 + year = bcd2bin(year);
  200 + y2k = bcd2bin(y2k);
201 201  
202 202 year += (y2k * 100);
203 203