[net-next 1/4] net: mvpp2: simplify PPv2 version ID read

From: stefanc
Date: Sun Feb 14 2021 - 08:41:05 EST


From: Stefan Chulski <stefanc@xxxxxxxxxxx>

PPv2.1 contain 0 in Version ID register, priv->hw_version check
can be removed.

Signed-off-by: Stefan Chulski <stefanc@xxxxxxxxxxx>
---
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index e88272f..9127dc2 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -7469,10 +7469,8 @@ static int mvpp2_probe(struct platform_device *pdev)
priv->port_map |= BIT(i);
}

- if (priv->hw_version != MVPP21) {
- if (mvpp2_read(priv, MVPP2_VER_ID_REG) == MVPP2_VER_PP23)
- priv->hw_version = MVPP23;
- }
+ if (mvpp2_read(priv, MVPP2_VER_ID_REG) == MVPP2_VER_PP23)
+ priv->hw_version = MVPP23;

/* Init mss lock */
spin_lock_init(&priv->mss_spinlock);
--
1.9.1