ixgbe: Simplify port-specific macros
Subsystems (2)
PATCH v2 1/1 ixgbe: Simplify port-specific macros
Simplify port-specific macros by eliminating explicit comparison with 0. More importantly, enclose formal parameter in parens to eliminate the risk of an operator precedence surprise.
---
Changes in V2:
- Corrected typo in log message
- Updated Copyright year in the file header
--- drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h +9 -9
@@ -1,7 +1,7 @@/******************************************************************************* Intel 10 Gigabit PCI Express Linux driver -Copyright(c) 1999 - 2014 Intel Corporation. +Copyright(c) 1999 - 2015 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License,
@@ -3462,14 +3462,14 @@ struct ixgbe_info {#define IXGBE_ERR_HOST_INTERFACE_COMMAND -33#define IXGBE_NOT_IMPLEMENTED 0x7FFFFFFF -#define IXGBE_KRM_PORT_CAR_GEN_CTRL (P ) ((P == 0) ? (0x4010) : (0x8010)) -#define IXGBE_KRM_LINK_CTRL_1 (P ) ((P == 0) ? (0x420C) : (0x820C)) -#define IXGBE_KRM_DSP_TXFFE_STATE_4 (P ) ((P == 0) ? (0x4634) : (0x8634)) -#define IXGBE_KRM_DSP_TXFFE_STATE_5 (P ) ((P == 0) ? (0x4638) : (0x8638)) -#define IXGBE_KRM_RX_TRN_LINKUP_CTRL (P ) ((P == 0) ? (0x4B00) : (0x8B00)) -#define IXGBE_KRM_PMD_DFX_BURNIN (P ) ((P == 0) ? (0x4E00) : (0x8E00)) -#define IXGBE_KRM_TX_COEFF_CTRL_1 (P ) ((P == 0) ? (0x5520) : (0x9520)) -#define IXGBE_KRM_RX_ANA_CTL (P ) ((P == 0) ? (0x5A00) : (0x9A00)) +#define IXGBE_KRM_PORT_CAR_GEN_CTRL (P ) ((P) ? 0x8010 : 0x4010) +#define IXGBE_KRM_LINK_CTRL_1 (P ) ((P) ? 0x820C : 0x420C) +#define IXGBE_KRM_DSP_TXFFE_STATE_4 (P ) ((P) ? 0x8634 : 0x4634) +#define IXGBE_KRM_DSP_TXFFE_STATE_5 (P ) ((P) ? 0x8638 : 0x4638) +#define IXGBE_KRM_RX_TRN_LINKUP_CTRL (P ) ((P) ? 0x8B00 : 0x4B00) +#define IXGBE_KRM_PMD_DFX_BURNIN (P ) ((P) ? 0x8E00 : 0x4E00) +#define IXGBE_KRM_TX_COEFF_CTRL_1 (P ) ((P) ? 0x9520 : 0x5520) +#define IXGBE_KRM_RX_ANA_CTL (P ) ((P) ? 0x9A00 : 0x5A00)#define IXGBE_KRM_PORT_CAR_GEN_CTRL_NELB_32B (1 << 9)#define IXGBE_KRM_PORT_CAR_GEN_CTRL_NELB_KRPCS (1 << 11)
Schmitt
PATCH v2 1/1 ixgbe: Simplify port-specific macros
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Mark D Rustad
Sent: Saturday, June 06, 2015 10:41 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH V2] ixgbe: Simplify port-specific macrosSimplify port-specific macros by eliminating explicit comparison with 0. More importantly, enclose formal parameter in parens to eliminate the risk of an operator precedence surprise.
Quoted 5 lines
Signed-off-by Mark Rustad <[email protected]>---
Changes in V2:
- Corrected typo in log message
- Updated Copyright year in the file header