From: Stefan Chulski Date: Sun, 14 Feb 2021 13:38:34 +0000 (+0200) Subject: net: mvpp2: simplify PPv2 version ID read X-Git-Tag: v5.12-rc1~200^2~47^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b986866b252c272a93f734ab8f1e577c7977677;p=thirdparty%2Fkernel%2Flinux.git 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 Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index e88272f8b600d..9127dc29d52bb 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);