diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-07 03:03:31 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-11-23 06:48:30 -0500 |
| commit | b41411954d4ccf6ddaa581178462017557b82b5d (patch) | |
| tree | f9439432d8dfa1073b0ba7b84f8289c4a9835c5f /board/gdsys | |
| parent | 111396ccb9a8d3e1f0e9d9921d3dbd6c7a70423f (diff) | |
| download | u-boot-imx-b41411954d4ccf6ddaa581178462017557b82b5d.zip u-boot-imx-b41411954d4ccf6ddaa581178462017557b82b5d.tar.gz u-boot-imx-b41411954d4ccf6ddaa581178462017557b82b5d.tar.bz2 | |
linux/kernel.h: sync min, max, min3, max3 macros with Linux
U-Boot has never cared about the type when we get max/min of two
values, but Linux Kernel does. This commit gets min, max, min3, max3
macros synced with the kernel introducing type checks.
Many of references of those macros must be fixed to suppress warnings.
We have two options:
- Use min, max, min3, max3 only when the arguments have the same type
(or add casts to the arguments)
- Use min_t/max_t instead with the appropriate type for the first
argument
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Acked-by: Pavel Machek <pavel@denx.de>
Acked-by: Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/gdsys')
| -rw-r--r-- | board/gdsys/p1022/controlcenterd-id.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/board/gdsys/p1022/controlcenterd-id.c b/board/gdsys/p1022/controlcenterd-id.c index 70eff91..317669b 100644 --- a/board/gdsys/p1022/controlcenterd-id.c +++ b/board/gdsys/p1022/controlcenterd-id.c @@ -236,7 +236,7 @@ static int ccdm_mmc_read(struct mmc *mmc, u64 src, u8 *dst, int size) tmp_buf); if (!n) goto failure; - result = min(size, blk_len - ofs); + result = min(size, (int)(blk_len - ofs)); memcpy(dst, tmp_buf + ofs, result); dst += result; size -= result; @@ -736,7 +736,8 @@ do_bin_func: src_buf = buf; for (ptr = (uint8_t *)src_buf, i = 20; i > 0; i -= data_size, ptr += data_size) - memcpy(ptr, data, min(i, data_size)); + memcpy(ptr, data, + min_t(size_t, i, data_size)); } } bin_func(dst_reg->digest, src_buf, 20); |