diff options
| author |   Rick Farrington <ricardo.farrington@cavium.com> | 2017-07-26 12:10:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-07-27 17:29:34 -0700 |
| commit | ade0a79ab11dc18f9ef377472e262ec13597d7ca (patch) | |
| tree | 94240b7d9487d29e567fbb0565c8874dbabd63ac /drivers/net/ethernet/cavium/liquidio/octeon_console.c | |
| parent | net: phy: Remove stale comments referencing timer (diff) | |
| download | linux-dev-ade0a79ab11dc18f9ef377472e262ec13597d7ca.tar.xz linux-dev-ade0a79ab11dc18f9ef377472e262ec13597d7ca.zip | |
liquidio: standardization: use min_t instead of custom macro
Signed-off-by: Rick Farrington <ricardo.farrington@cavium.com>
Signed-off-by: Derek Chickles <derek.chickles@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio/octeon_console.c')
| -rw-r--r-- | drivers/net/ethernet/cavium/liquidio/octeon_console.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_console.c b/drivers/net/ethernet/cavium/liquidio/octeon_console.c index e08f7600f986..501ad95171fe 100644 --- a/drivers/net/ethernet/cavium/liquidio/octeon_console.c +++ b/drivers/net/ethernet/cavium/liquidio/octeon_console.c @@ -42,7 +42,6 @@ module_param(console_bitmask, int, 0644); 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 |