net: mvpp2: simplify PPv2 version ID read

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

Signed-off-by: Stefan Chulski <stefanc@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
index e88272f8b600dc5fe93da6c356e6e63783015106..9127dc29d52bbae6c977bc08eecf1e8c60e0318a 100644 (file)
--- 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);