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: 12391249 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80424C12002 for ; Wed, 21 Jul 2021 15:04:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 695A760FF1 for ; Wed, 21 Jul 2021 15:04:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239534AbhGUOXZ (ORCPT ); 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 X-Patchwork-Delegate: kuba@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(-) 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