aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/freescale
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-04-24 12:39:45 +0100
committerDavid S. Miller <davem@davemloft.net>2018-04-24 16:00:37 -0400
commit080aaddae5b378ebb0f06d297bf05cf4ec5b47ac (patch)
treeaef5d6fe657e125ce86d6ea2b9b53f994c06febf /drivers/net/ethernet/freescale
parentqed: Fix copying 2 strings (diff)
downloadlinux-dev-080aaddae5b378ebb0f06d297bf05cf4ec5b47ac.tar.xz
linux-dev-080aaddae5b378ebb0f06d297bf05cf4ec5b47ac.zip
fsl/fman_port: remove redundant check on port->rev_info.major
The check port->rev_info.major >= 6 is being performed twice, thus the inner second check is always true and is redundant, hence it can be removed. Detected by cppcheck. drivers/net/ethernet/freescale/fman/fman_port.c:1394]: (warning) Identical inner 'if' condition is always true. Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale')
-rw-r--r--drivers/net/ethernet/freescale/fman/fman_port.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/ethernet/freescale/fman/fman_port.c b/drivers/net/ethernet/freescale/fman/fman_port.c
index 6552d68ea6e1..ce6e24c74978 100644
--- a/drivers/net/ethernet/freescale/fman/fman_port.c
+++ b/drivers/net/ethernet/freescale/fman/fman_port.c
@@ -1391,12 +1391,10 @@ int fman_port_config(struct fman_port *port, struct fman_port_params *params)
/* FM_WRONG_RESET_VALUES_ERRATA_FMAN_A005127 Errata
* workaround
*/
- if (port->rev_info.major >= 6) {
- u32 reg;
+ u32 reg;
- reg = 0x00001013;
- iowrite32be(reg, &port->bmi_regs->tx.fmbm_tfp);
- }
+ reg = 0x00001013;
+ iowrite32be(reg, &port->bmi_regs->tx.fmbm_tfp);
}
return 0;