From: Rick Farrington <ricardo.farring...@cavium.com>
Replaced custom MIN macro with use of standard 'min_t'.
Signed-off-by: Rick Farrington <ricardo.farring...@cavium.com>
Signed-off-by: Derek Chickles <derek.chick...@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlu...@cavium.com>
---
drivers/net/ethernet/cavium/liquidio/octeon_console.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c
b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
index 53f38d0..2dc0e30 100644
--- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c
+++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c
@@ -42,7 +42,6 @@ static int octeon_console_read(struct octeon_device *oct, u32
console_num,
MODULE_PARM_DESC(console_bitmask,
"Bitmask indicating which consoles have debug output
redirected to syslog.");
-#define MIN(a, b) min((a), (b))
#define CAST_ULL(v) ((u64)(v))
#define BOOTLOADER_PCI_READ_BUFFER_DATA_ADDR 0x0006c008
@@ -704,7 +703,7 @@ static int octeon_console_read(struct octeon_device *oct,
u32 console_num,
if (bytes_to_read <= 0)
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
* ourselves to the contiguous block
--
1.8.3.1
