Commit ade0a79a authored by Rick Farrington's avatar Rick Farrington Committed by David S. Miller

liquidio: standardization: use min_t instead of custom macro

Signed-off-by: default avatarRick Farrington <ricardo.farrington@cavium.com>
Signed-off-by: default avatarDerek Chickles <derek.chickles@cavium.com>
Signed-off-by: default avatarFelix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb5e7606
...@@ -42,7 +42,6 @@ module_param(console_bitmask, int, 0644); ...@@ -42,7 +42,6 @@ module_param(console_bitmask, int, 0644);
MODULE_PARM_DESC(console_bitmask, MODULE_PARM_DESC(console_bitmask,
"Bitmask indicating which consoles have debug output redirected to syslog."); "Bitmask indicating which consoles have debug output redirected to syslog.");
#define MIN(a, b) min((a), (b))
#define CAST_ULL(v) ((u64)(v)) #define CAST_ULL(v) ((u64)(v))
#define BOOTLOADER_PCI_READ_BUFFER_DATA_ADDR 0x0006c008 #define BOOTLOADER_PCI_READ_BUFFER_DATA_ADDR 0x0006c008
...@@ -704,7 +703,7 @@ static int octeon_console_read(struct octeon_device *oct, u32 console_num, ...@@ -704,7 +703,7 @@ static int octeon_console_read(struct octeon_device *oct, u32 console_num,
if (bytes_to_read <= 0) if (bytes_to_read <= 0)
return bytes_to_read; return bytes_to_read;
bytes_to_read = MIN(bytes_to_read, (s32)buf_size); bytes_to_read = min_t(s32, bytes_to_read, buf_size);
/* Check to see if what we want to read is not contiguous, and limit /* Check to see if what we want to read is not contiguous, and limit
* ourselves to the contiguous block * ourselves to the contiguous block
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment