From patchwork Wed Jul 21 15:01:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 483308 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp6280353jao; Wed, 21 Jul 2021 08:04:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwapdoymj43ozuaGx9zWOi5YB5fYxIejj8Scbzzy8XSX6BkIdVfniDrgCOtvPdsg4jKyklF X-Received: by 2002:a92:b003:: with SMTP id x3mr24599182ilh.93.1626879884622; Wed, 21 Jul 2021 08:04:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626879884; cv=none; d=google.com; s=arc-20160816; b=irJFhCJnSlXr86IwPuYFEhNoVp9CH+ZiRE1A/30WJI5b6fNtblgH2DFfpxKCH0KzFM A08t2EVxpB5iFl3fFsPZV5ayBT2sl+/eT7LK6Y+lFDqd7DckYPhNWFTeL576pCeXUGGY mZZ6Yr6ONP6X+FpPzi8Vok/GaxHUzF4LeyHcBA7vQG8b1QDQo1WI0JeN788G6y9qSPMe n9lZnA4Pi2/JTGIZ35OGkT+qBa8U9wDJAtgwZ52ODhpX8JyRgHsUhZG8yGPunDf4xc5i ESf+PbG7IxnoIzQJlq04QNVKWVE6r6MWwQTeekqaBL6yHXYmUiCBlgkWtGptU+8xVHKZ WOzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=SD1ElB3mPNZKvmPXdN5RlqJ4wbZocJ0FygpyWL4NFN4=; b=wz5yt/h/MXgcyg2XJYzA0TzylqW3Yj1nwYNW8Iib0FD71FZzOwda4+E20njxd9xXJ9 d88weOBFAql2+SXAjaePScKnOfh6uc1A2HOptENHEldP2qREA2B36Zlk5NHGLecEaBdE 5dzCMr7iK9p4zXH+0PGTbgXZFf7ikrNwzUY9qSxwzi7WiiZ0+UscWMuLliEeU2VJBttu +U2lUwxyxnq10lpoH4wQ7z60mJrKh1l88XzKFqkz4HgD7DhO0V/EW1tU3hQ9nDZyCPFv 0wo2Tls/o3DX77PfTd+GyRlIn4qDaYvwD6w04JUXmNXMlvZv3nLzNt4N7TXQZoecwMjT JfPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Lq0mnd0I; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q15si18535116jat.18.2021.07.21.08.04.44; Wed, 21 Jul 2021 08:04:44 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-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=@kernel.org header.s=k20201202 header.b=Lq0mnd0I; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239534AbhGUOXZ (ORCPT + 8 others); Wed, 21 Jul 2021 10:23:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:56964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239497AbhGUOVM (ORCPT ); Wed, 21 Jul 2021 10:21:12 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 63F616120E; Wed, 21 Jul 2021 15:01:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626879706; bh=GM/YKf0TTowOMKZHs3ZnhJSjFzIIGc4teYwggsZx9lc=; h=From:To:Cc:Subject:Date:From; b=Lq0mnd0IoQnmGV2JZnegOxfb8QAUNrwT0agSZfZow+n1t+PE/Hu0lr80u/KA1ftnx Co+Sq7CgU1s2sbjVIpwDBsRS9fxERAWkJYeIR1U/AwCQ307+94z2yG88a4YQvKFA6G gaYrqnCqy9upHb+BrJQH6n8dMeEWj/b6hkN7k3yB4lzj2GnqvgsgjcWTl/j9xcOx1z 48dxLyHJGhREwTBM9fxRkr9j22c3fHZsN98dDRYIM2Rm+LuDjoJYH6mFByngdn+xFh Q8GkJTKS3I9Oh/E7xBKiI9K4xMn3r9LtS/jVhPlakj1j258oCei9v4vkQS+PnwAC1b Y3OhnDnaRQ86w== From: Arnd Bergmann To: Andrew Lunn , Heiner Kallweit Cc: Arnd Bergmann , Russell King , "David S. Miller" , Jakub Kicinski , David Bauer , Michael Walle , Ioana Ciornei , Ansuel Smith , Fabio Estevam , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch Date: Wed, 21 Jul 2021 17:01:28 +0200 Message-Id: <20210721150141.1737124-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann There are two conflicting patches in net-next, one removed the at803x_get_features() function and the other added another user: drivers/net/phy/at803x.c: In function 'at803x_get_features': drivers/net/phy/at803x.c:706:14: error: implicit declaration of function 'at803x_match_phy_id' [-Werror=implicit-function-declaration] Change the new caller over to an open-coded comparison as well. Fixes: 8887ca5474bd ("net: phy: at803x: simplify custom phy id matching") Fixes: b856150c8098 ("net: phy: at803x: mask 1000 Base-X link mode") Signed-off-by: Arnd Bergmann --- drivers/net/phy/at803x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.29.2 diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index 0790ffcd3db6..bdac087058b2 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c @@ -703,7 +703,7 @@ static int at803x_get_features(struct phy_device *phydev) if (err) return err; - if (!at803x_match_phy_id(phydev, ATH8031_PHY_ID)) + if (phydev->drv->phy_id != ATH8031_PHY_ID) return 0; /* AR8031/AR8033 have different status registers