Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4294834pxb; Sun, 14 Feb 2021 05:42:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJwe+kUwyTlllexTZtz3xRXw/FbOdU1YkcHUBV3j16Ai0pwlGUlz7Xacoj3zgybye4v0BeOo X-Received: by 2002:a17:906:bc88:: with SMTP id lv8mr162163ejb.300.1613310172489; Sun, 14 Feb 2021 05:42:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613310172; cv=none; d=google.com; s=arc-20160816; b=sKQsCZDWJSM9BOA2/XNxwdMPo9dYIcktpz9phdQxCOQcpDMMhz/eEkK5Uj2cEqoT8x sxZ1KwaidOmZuhoLujDveq62+F2mgHAMOF4Odd6xPcuiPUvr204zzhay7wQ0WzmAoKvo mSq9Iz20K7OQaIijCHmYOAljgLl7r2KvMAMuPMdiP1ox4MfoXBVoQtz56yh/v/RWAUXZ WlY22xMFdkk5YLf3TlHLf6REGpvXFhhOamCTNfKqzVDnyPQJzqvDViwxohByhfhfbu2a Q5wDIIMeNtnBKOX+b7ijE8vXhn9N0QXZkpSMgsyuUWTRgaPt3EbPCi2Q73HMJAWkgfIQ pMbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=qW9zL3rPdfmlwjMaLhkOuc1rmBoEJNezgQHiqqrUETc=; b=mZbmf3i37dNzaB0A/vE0cWm8EWO7kG3aUSnROtMKyNSUsv3b50aN6B28CU43PBTORh AT1TS3oS8Fv9VeW5BqBEQx/A9vGY7OBFt90opdFt2ctkBFdVj4gdO7bbOmiZlUgBkRPW piE89xhIiZvGq5o7yaFVyJfn4qH4hL+q7mhNgt9Maq9ecZnLeYoEBPM6m1aqPNDSIL30 ZQhuojFUj4301CrV0+ifw2E/Nt58KdrcMxDxwWGd3f3e1jNA///ApqnxrvU7sZDcsXtR PWp05tF3Lx4QNCnZkcF0haY1kMHZ0fg31sXRa4+H6SpNYRbheulJOsOQ6M40Tcc8b46W 9rxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=ZLhrMLwQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q19si11500651edv.67.2021.02.14.05.42.09; Sun, 14 Feb 2021 05:42:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=ZLhrMLwQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229829AbhBNNkd (ORCPT + 99 others); Sun, 14 Feb 2021 08:40:33 -0500 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:57342 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229637AbhBNNk2 (ORCPT ); Sun, 14 Feb 2021 08:40:28 -0500 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 11EDZ4am024576; Sun, 14 Feb 2021 05:39:39 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0220; bh=qW9zL3rPdfmlwjMaLhkOuc1rmBoEJNezgQHiqqrUETc=; b=ZLhrMLwQ8jkOcvyuHDan18eQLpohKLGMoVwEcfYM03VCFVWwmxa2cdvoNPp5PpES0DWY DZy5TTWh4ogZH52C+FuLVdlXwmHDmAF2wuV1gPK32wSzGljbuiK4bt0cmOvRphSx2gaw O1/zsUd4c5v92bncy8hjtwHNd794vroI6lwLKf42+HJRS8xo/D9KVT1Ml0rQA1Pe11ww oKFxXQ3zT86sUPb4yz3rewkskAL28rUz+FEN7pBQMpnTrE5scsRyzcnMOzventux+yPy UfYzEuCJKfk/nAXVopEHgadfIE1TJd1g2RJJltoLqRSks86hg+uRJGu9yHNORnxEbxr1 Tg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 36pd0vhyx9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 14 Feb 2021 05:39:39 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 14 Feb 2021 05:39:37 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 14 Feb 2021 05:39:37 -0800 Received: from stefan-pc.marvell.com (stefan-pc.marvell.com [10.5.25.21]) by maili.marvell.com (Postfix) with ESMTP id EF78D3F7040; Sun, 14 Feb 2021 05:39:34 -0800 (PST) From: To: CC: , , , , , , , , , , , Subject: [net-next 1/4] net: mvpp2: simplify PPv2 version ID read Date: Sun, 14 Feb 2021 15:38:34 +0200 Message-ID: <1613309917-17569-2-git-send-email-stefanc@marvell.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1613309917-17569-1-git-send-email-stefanc@marvell.com> References: <1613309917-17569-1-git-send-email-stefanc@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.369,18.0.737 definitions=2021-02-14_03:2021-02-12,2021-02-14 signatures=0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Chulski PPv2.1 contain 0 in Version ID register, priv->hw_version check can be removed. Signed-off-by: Stefan Chulski --- 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