Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit c79cba37b3b42cf8fbd71babcd8998867f76fead

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 87f13aa00d
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

cosmetic: replace MIN, MAX with min, max 

The macro MIN, MAX is defined as the aliase of min, max,
respectively.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 13 changed files with 39 additions and 39 deletions Side-by-side Diff

arch/arm/cpu/arm1176/tnetv107x/clock.c
Diff comments   View file @ c79cba3
... ... @@ -362,7 +362,7 @@
362 362 pllctl_reg_write(data->pll, ctl, tmp);
363 363  
364 364 mult = data->pll_freq / fpll;
365   - for (mult = MAX(mult, 1); mult <= MAX_MULT; mult++) {
  365 + for (mult = max(mult, 1); mult <= MAX_MULT; mult++) {
366 366 div = (fpll * mult) / data->pll_freq;
367 367 if (div < 1 || div > MAX_DIV)
368 368 continue;
arch/arm/cpu/armv7/mx6/ddr.c
Diff comments   View file @ c79cba3
... ... @@ -247,47 +247,47 @@
247 247  
248 248 switch (ddr3_cfg->mem_speed) {
249 249 case 800:
250   - txp = DIV_ROUND_UP(MAX(3 * clkper, 7500), clkper) - 1;
251   - tcke = DIV_ROUND_UP(MAX(3 * clkper, 7500), clkper) - 1;
  250 + txp = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
  251 + tcke = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
252 252 if (ddr3_cfg->pagesz == 1) {
253 253 tfaw = DIV_ROUND_UP(40000, clkper) - 1;
254   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 10000), clkper) - 1;
  254 + trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
255 255 } else {
256 256 tfaw = DIV_ROUND_UP(50000, clkper) - 1;
257   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 10000), clkper) - 1;
  257 + trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
258 258 }
259 259 break;
260 260 case 1066:
261   - txp = DIV_ROUND_UP(MAX(3 * clkper, 7500), clkper) - 1;
262   - tcke = DIV_ROUND_UP(MAX(3 * clkper, 5625), clkper) - 1;
  261 + txp = DIV_ROUND_UP(max(3 * clkper, 7500), clkper) - 1;
  262 + tcke = DIV_ROUND_UP(max(3 * clkper, 5625), clkper) - 1;
263 263 if (ddr3_cfg->pagesz == 1) {
264 264 tfaw = DIV_ROUND_UP(37500, clkper) - 1;
265   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 7500), clkper) - 1;
  265 + trrd = DIV_ROUND_UP(max(4 * clkper, 7500), clkper) - 1;
266 266 } else {
267 267 tfaw = DIV_ROUND_UP(50000, clkper) - 1;
268   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 10000), clkper) - 1;
  268 + trrd = DIV_ROUND_UP(max(4 * clkper, 10000), clkper) - 1;
269 269 }
270 270 break;
271 271 case 1333:
272   - txp = DIV_ROUND_UP(MAX(3 * clkper, 6000), clkper) - 1;
273   - tcke = DIV_ROUND_UP(MAX(3 * clkper, 5625), clkper) - 1;
  272 + txp = DIV_ROUND_UP(max(3 * clkper, 6000), clkper) - 1;
  273 + tcke = DIV_ROUND_UP(max(3 * clkper, 5625), clkper) - 1;
274 274 if (ddr3_cfg->pagesz == 1) {
275 275 tfaw = DIV_ROUND_UP(30000, clkper) - 1;
276   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 6000), clkper) - 1;
  276 + trrd = DIV_ROUND_UP(max(4 * clkper, 6000), clkper) - 1;
277 277 } else {
278 278 tfaw = DIV_ROUND_UP(45000, clkper) - 1;
279   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 7500), clkper) - 1;
  279 + trrd = DIV_ROUND_UP(max(4 * clkper, 7500), clkper) - 1;
280 280 }
281 281 break;
282 282 case 1600:
283   - txp = DIV_ROUND_UP(MAX(3 * clkper, 6000), clkper) - 1;
284   - tcke = DIV_ROUND_UP(MAX(3 * clkper, 5000), clkper) - 1;
  283 + txp = DIV_ROUND_UP(max(3 * clkper, 6000), clkper) - 1;
  284 + tcke = DIV_ROUND_UP(max(3 * clkper, 5000), clkper) - 1;
285 285 if (ddr3_cfg->pagesz == 1) {
286 286 tfaw = DIV_ROUND_UP(30000, clkper) - 1;
287   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 6000), clkper) - 1;
  287 + trrd = DIV_ROUND_UP(max(4 * clkper, 6000), clkper) - 1;
288 288 } else {
289 289 tfaw = DIV_ROUND_UP(40000, clkper) - 1;
290   - trrd = DIV_ROUND_UP(MAX(4 * clkper, 7500), clkper) - 1;
  290 + trrd = DIV_ROUND_UP(max(4 * clkper, 7500), clkper) - 1;
291 291 }
292 292 break;
293 293 default:
294 294  
295 295  
... ... @@ -295,18 +295,18 @@
295 295 hang();
296 296 break;
297 297 }
298   - txpdll = DIV_ROUND_UP(MAX(10 * clkper, 24000), clkper) - 1;
299   - tcksre = DIV_ROUND_UP(MAX(5 * clkper, 10000), clkper);
  298 + txpdll = DIV_ROUND_UP(max(10 * clkper, 24000), clkper) - 1;
  299 + tcksre = DIV_ROUND_UP(max(5 * clkper, 10000), clkper);
300 300 taonpd = DIV_ROUND_UP(2000, clkper) - 1;
301 301 tcksrx = tcksre;
302 302 taofpd = taonpd;
303 303 twr = DIV_ROUND_UP(15000, clkper) - 1;
304   - tmrd = DIV_ROUND_UP(MAX(12 * clkper, 15000), clkper) - 1;
  304 + tmrd = DIV_ROUND_UP(max(12 * clkper, 15000), clkper) - 1;
305 305 trc = DIV_ROUND_UP(ddr3_cfg->trcmin, clkper / 10) - 1;
306 306 tras = DIV_ROUND_UP(ddr3_cfg->trasmin, clkper / 10) - 1;
307 307 tcl = DIV_ROUND_UP(ddr3_cfg->trcd, clkper / 10) - 3;
308 308 trp = DIV_ROUND_UP(ddr3_cfg->trcd, clkper / 10) - 1;
309   - twtr = ROUND(MAX(4 * clkper, 7500) / clkper, 1) - 1;
  309 + twtr = ROUND(max(4 * clkper, 7500) / clkper, 1) - 1;
310 310 trcd = trp;
311 311 trtp = twtr;
312 312 cs0_end = 4 * sysinfo->cs_density - 1;
arch/x86/lib/physmem.c
Diff comments   View file @ c79cba3
... ... @@ -189,7 +189,7 @@
189 189  
190 190 /* Handle memory below 4GB. */
191 191 if (start <= max_addr) {
192   - phys_size_t low_size = MIN(max_addr + 1 - start, size);
  192 + phys_size_t low_size = min(max_addr + 1 - start, size);
193 193 void *start_ptr = (void *)(uintptr_t)start;
194 194  
195 195 assert(((phys_addr_t)(uintptr_t)start) == start);
... ... @@ -208,7 +208,7 @@
208 208 /* Handle the first partial page. */
209 209 if (offset) {
210 210 phys_addr_t end =
211   - MIN(map_addr + LARGE_PAGE_SIZE, start + size);
  211 + min(map_addr + LARGE_PAGE_SIZE, start + size);
212 212 phys_size_t cur_size = end - start;
213 213 x86_phys_memset_page(map_addr, offset, c, cur_size);
214 214 size -= cur_size;
board/freescale/common/ics307_clk.c
Diff comments   View file @ c79cba3
... ... @@ -67,7 +67,7 @@
67 67 continue;
68 68 /* Calculate the temp out frequency */
69 69 tmp_out = input_freq * 2 * vdw / (rdw * od * 1000);
70   - diff = MAX(out_freq, tmp_out) - MIN(out_freq, tmp_out);
  70 + diff = max(out_freq, tmp_out) - min(out_freq, tmp_out);
71 71 /*
72 72 * calculate the percent, the precision is 1/1000
73 73 * If greater than 1/1000, continue
drivers/dma/fsl_dma.c
Diff comments   View file @ c79cba3
... ... @@ -96,7 +96,7 @@
96 96 uint xfer_size;
97 97  
98 98 while (count) {
99   - xfer_size = MIN(FSL_DMA_MAX_SIZE, count);
  99 + xfer_size = min(FSL_DMA_MAX_SIZE, count);
100 100  
101 101 out_dma32(&dma->dar, (u32) (dest & 0xFFFFFFFF));
102 102 out_dma32(&dma->sar, (u32) (src & 0xFFFFFFFF));
drivers/i2c/ihs_i2c.c
Diff comments   View file @ c79cba3
... ... @@ -84,7 +84,7 @@
84 84 int shift = (alen-1) * 8;
85 85  
86 86 while (alen) {
87   - int transfer = MIN(alen, 2);
  87 + int transfer = min(alen, 2);
88 88 uchar buf[2];
89 89 bool is_last = alen <= transfer;
90 90  
... ... @@ -113,7 +113,7 @@
113 113 return 1;
114 114  
115 115 while (len) {
116   - int transfer = MIN(len, 2);
  116 + int transfer = min(len, 2);
117 117  
118 118 if (ihs_i2c_transfer(chip, buffer, transfer, read,
119 119 len <= transfer))
drivers/mmc/fsl_esdhc.c
Diff comments   View file @ c79cba3
... ... @@ -610,7 +610,7 @@
610 610 #endif
611 611  
612 612 cfg->cfg.f_min = 400000;
613   - cfg->cfg.f_max = MIN(gd->arch.sdhc_clk, 52000000);
  613 + cfg->cfg.f_max = min(gd->arch.sdhc_clk, 52000000);
614 614  
615 615 cfg->cfg.b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT;
616 616  
drivers/serial/usbtty.c
Diff comments   View file @ c79cba3
... ... @@ -475,7 +475,7 @@
475 475 if (space) {
476 476 write_buffer (&usbtty_output);
477 477  
478   - n = MIN (space, MIN (len, maxlen));
  478 + n = min(space, min(len, maxlen));
479 479 buf_push (&usbtty_output, str, n);
480 480  
481 481 str += n;
... ... @@ -882,7 +882,7 @@
882 882 space_avail =
883 883 current_urb->buffer_length -
884 884 current_urb->actual_length;
885   - popnum = MIN (space_avail, buf->size);
  885 + popnum = min(space_avail, buf->size);
886 886 if (popnum == 0)
887 887 break;
888 888  
drivers/usb/gadget/designware_udc.c
Diff comments   View file @ c79cba3
... ... @@ -269,7 +269,7 @@
269 269 UDCDBGA("urb->buffer %p, buffer_length %d, actual_length %d",
270 270 urb->buffer, urb->buffer_length, urb->actual_length);
271 271  
272   - last = MIN(urb->actual_length - endpoint->sent,
  272 + last = min(urb->actual_length - endpoint->sent,
273 273 endpoint->tx_packetSize);
274 274  
275 275 if (last) {
... ... @@ -285,7 +285,7 @@
285 285  
286 286 align = ((ulong)cp % sizeof(int));
287 287 if (align)
288   - last = MIN(last, sizeof(int) - align);
  288 + last = min(last, sizeof(int) - align);
289 289  
290 290 UDCDBGA("endpoint->sent %d, tx_packetSize %d, last %d",
291 291 endpoint->sent, endpoint->tx_packetSize, last);
drivers/usb/gadget/ep0.c
Diff comments   View file @ c79cba3
... ... @@ -315,7 +315,7 @@
315 315 /*copy_config(urb, &report_descriptor->bData[0], report_descriptor->wLength, max); */
316 316 if (max - urb->actual_length > 0) {
317 317 int length =
318   - MIN (report_descriptor->wLength,
  318 + min(report_descriptor->wLength,
319 319 max - urb->actual_length);
320 320 memcpy (urb->buffer + urb->actual_length,
321 321 &report_descriptor->bData[0], length);
drivers/usb/gadget/mpc8xx_udc.c
Diff comments   View file @ c79cba3
... ... @@ -897,7 +897,7 @@
897 897 pkt_len = urb->actual_length - epi->sent;
898 898  
899 899 if (pkt_len > epi->tx_packetSize || pkt_len > EP_MAX_PKT) {
900   - pkt_len = MIN (epi->tx_packetSize, EP_MAX_PKT);
  900 + pkt_len = min(epi->tx_packetSize, EP_MAX_PKT);
901 901 }
902 902  
903 903 for (x = 0; x < pkt_len; x++) {
... ... @@ -942,7 +942,7 @@
942 942  
943 943 /* TX ACK : USB 2.0 8.7.2, Toggle PID, Advance TX */
944 944 epi->sent += pkt_len;
945   - epi->last = MIN (urb->actual_length - epi->sent, epi->tx_packetSize);
  945 + epi->last = min(urb->actual_length - epi->sent, epi->tx_packetSize);
946 946 TOGGLE_TX_PID (ep_ref[ep].pid);
947 947  
948 948 if (epi->sent >= epi->tx_urb->actual_length) {
drivers/usb/gadget/pxa27x_udc.c
Diff comments   View file @ c79cba3
... ... @@ -65,7 +65,7 @@
65 65 if (!urb || !urb->actual_length)
66 66 return -1;
67 67  
68   - n = MIN(urb->actual_length - endpoint->sent, endpoint->tx_packetSize);
  68 + n = min(urb->actual_length - endpoint->sent, endpoint->tx_packetSize);
69 69 if (n <= 0)
70 70 return -1;
71 71  
... ... @@ -772,7 +772,7 @@
772 772  
773 773 while (bseen < array_len) {
774 774 struct zap_leaf_array *la = &ZAP_LEAF_CHUNK(l, blksft, chunk).l_array;
775   - int toread = MIN(array_len - bseen, ZAP_LEAF_ARRAY_BYTES);
  775 + int toread = min(array_len - bseen, ZAP_LEAF_ARRAY_BYTES);
776 776  
777 777 if (chunk >= ZAP_LEAF_NUMCHUNKS(blksft))
778 778 return 0;
... ... @@ -794,7 +794,7 @@
794 794  
795 795 while (bseen < array_len) {
796 796 struct zap_leaf_array *la = &ZAP_LEAF_CHUNK(l, blksft, chunk).l_array;
797   - int toread = MIN(array_len - bseen, ZAP_LEAF_ARRAY_BYTES);
  797 + int toread = min(array_len - bseen, ZAP_LEAF_ARRAY_BYTES);
798 798  
799 799 if (chunk >= ZAP_LEAF_NUMCHUNKS(blksft))
800 800 /* Don't use errno because this error is to be ignored. */
... ... @@ -2118,7 +2118,7 @@
2118 2118 data->file_start = blkid * blksz;
2119 2119 data->file_end = data->file_start + blksz;
2120 2120  
2121   - movesize = MIN(length, data->file_end - (int) file->offset - red);
  2121 + movesize = min(length, data->file_end - (int)file->offset - red);
2122 2122  
2123 2123 memmove(buf, data->file_buf + file->offset + red
2124 2124 - data->file_start, movesize);