From patchwork Tue Jun 6 08:27:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 103665 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp3251316vqr; Tue, 6 Jun 2023 02:06:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4mesBmCA0a+NV6EntrZ+Ehg30SBWLRd8kVtLUOJ5e+1P4iDeovWX3sRr6INvjQmpl0Byyt X-Received: by 2002:a05:6870:b285:b0:19a:1331:9d4d with SMTP id c5-20020a056870b28500b0019a13319d4dmr1701770oao.23.1686042375725; Tue, 06 Jun 2023 02:06:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686042375; cv=none; d=google.com; s=arc-20160816; b=yPLSYNnApvYt4c2awUt9UxLSeUTSw2TbqKBQ2s1fEJ84wyIw4xrOk6mDtgBQKqsKVw +O3vNDDfmMSEFM0/I1CUaXvqqFxGQAUDLijAF5IEqmJ0W8r3GaDuiemUu0faz0a3DWZg qdoWXktG7WCqkzm2tZmFqDtBVvvCQO9wzN/YSojzAeSRt4HwO5TeFEMa5OahFIusj3Kb /O3aF99GAOCLYT8i8CEwQyMpIiFV9Ay96MFO26aHmBYtw8wRkHfR9WX67sG7gKOvfdkY hk+zzSCZyMI+EV07GNTIxqr/BPi3GzmYjr/z5csvoPz586bmrSbggADR47s3XG1/fCFc IvTg== 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; bh=3v6mSvu04Pw3GcdnZm0etGwwQs6Dtxrjx1g0OcfV+2s=; b=0NzibzeV6oifWQD3lTlrTFPeW7DHDk7dk8rVXaVTVPDFY3on5fW6WuWI5gnIyEaVG5 ypywsJBGO/AQHApB7m+E6Pwigb8kSwLfPcIgLDwjrQCnqJKEegD89pPi+gg+I+cAFpgp cjsno7L/DYsyfUqxDicg3rhDcjLNPJow/usj5+CYBRQh43b0BYZA4eo9grh3olQp4sZ2 uX2hkiMNawBoUJI9yaTkWClH8HY3lEY0qTbsDJ9mwAQWl/eSZyp7Q9OgUvWgvYNahcfe GYKj707YJOB3jtn9cTv54Fw7A+h+KQmM4x5l8LgBkuEItbStZ97U1ugreCjiAqJnEW2C +B+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w29-20020a63af1d000000b0053f23442f2bsi6809408pge.443.2023.06.06.02.06.02; Tue, 06 Jun 2023 02:06:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237093AbjFFI3D (ORCPT + 99 others); Tue, 6 Jun 2023 04:29:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237107AbjFFI2q (ORCPT ); Tue, 6 Jun 2023 04:28:46 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F9BA1BC7 for ; Tue, 6 Jun 2023 01:27:21 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed30:a3e8:6562:a823:d832]) by laurent.telenet-ops.be with bizsmtp id 5kT42A00H1Tjf1k01kT4vb; Tue, 06 Jun 2023 10:27:13 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1q6S1b-004GxN-Ly; Tue, 06 Jun 2023 10:27:04 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1q6S1w-00Awvw-EK; Tue, 06 Jun 2023 10:27:04 +0200 From: Geert Uytterhoeven To: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Maxime Chevallier , Simon Horman Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] net: stmmac: Fix build without PCS_LYNX Date: Tue, 6 Jun 2023 10:27:01 +0200 Message-Id: <7b36ac43778b41831debd5c30b5b37d268512195.1686039915.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767943570417813150?= X-GMAIL-MSGID: =?utf-8?q?1767943570417813150?= If STMMAC_ETH=y, but PCS_LYNX=n (e.g. shmobile_defconfig): arm-linux-gnueabihf-ld: drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.o: in function `stmmac_mdio_unregister': stmmac_mdio.c:(.text+0xfbc): undefined reference to `lynx_pcs_destroy' As pcs_lynx is used only on dwmac_socfpga, fix this by adding a check for PCS_LYNX to the cleanup path in the generic driver. Fixes: 5d1f3fe7d2d54d04 ("net: stmmac: dwmac-sogfpga: use the lynx pcs driver") Signed-off-by: Geert Uytterhoeven --- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index c784a6731f08e108..53ed59d732210814 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -665,7 +665,7 @@ int stmmac_mdio_unregister(struct net_device *ndev) if (priv->hw->xpcs) xpcs_destroy(priv->hw->xpcs); - if (priv->hw->lynx_pcs) + if (IS_ENABLED(CONFIG_PCS_LYNX) && priv->hw->lynx_pcs) lynx_pcs_destroy(priv->hw->lynx_pcs); mdiobus_unregister(priv->mii);