diff options
| author | Masahiro Yamada <[email protected]> | 2014-11-07 03:03:31 +0900 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2014-11-23 06:48:30 -0500 |
| commit | b41411954d4ccf6ddaa581178462017557b82b5d (patch) | |
| tree | f9439432d8dfa1073b0ba7b84f8289c4a9835c5f /drivers/misc | |
| parent | 111396ccb9a8d3e1f0e9d9921d3dbd6c7a70423f (diff) | |
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 <[email protected]>
Acked-by: Pavel Machek <[email protected]>
Acked-by: Lukasz Majewski <[email protected]>
Tested-by: Lukasz Majewski <[email protected]>
[trini: Fixup arch/blackfin/lib/string.c]
Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/cros_ec_spi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/cros_ec_spi.c b/drivers/misc/cros_ec_spi.c index e403664bb56..e6dba298b1e 100644 --- a/drivers/misc/cros_ec_spi.c +++ b/drivers/misc/cros_ec_spi.c @@ -143,7 +143,7 @@ int cros_ec_spi_command(struct cros_ec_dev *dev, uint8_t cmd, int cmd_version, return -1; } - len = min(p[1], din_len); + len = min((int)p[1], din_len); cros_ec_dump_data("in", -1, p, len + 3); /* Response code is first byte of message */ |