From patchwork Mon Oct 4 12:52:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515202 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp4358644wrs; Mon, 4 Oct 2021 06:37:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw2jZbW1PHMlZrZzC27I8TDHoI1MPlUnLnrNXytM6BLXmQJri2bZTSn2oVLUvqFhKIpmcul X-Received: by 2002:a17:903:1cc:b0:13e:3a0f:b2ae with SMTP id e12-20020a17090301cc00b0013e3a0fb2aemr23323041plh.3.1633354637295; Mon, 04 Oct 2021 06:37:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633354637; cv=none; d=google.com; s=arc-20160816; b=svHDgw24eNli7sSrN6MgeYrs66m1yAXABLkBsI9X9EMbWPXpqm2NvPYQwgLqUVVuY/ MR+gJyE5x7X8/rdaI0RTOsB0yOCsvUDnWye8aE2ZsldQWLP3z+TQPuJI9msndvJwqPmo V50PHCE9SYvTXTcG8SeurySf11icSICUOYBjKb6XzH0epZvj/KViUtGOlIIGZK8j8rst CgaiJQ9FxpryTPWIfHiwoOx3qPPWLyxDfLYzkwXycgCJKgpFoSB7ShJfg7lFw9LLHuDE OPc3ECHhZuNdAfULPZtSsGTN37VeRIGkP+yMpx0CzNEnCQhBc08njrBwr7PqqlXw5fHW TGEA== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OZeXfyvaNhyqVWAnVs7UGSFaoP87xmOHskwb4UUgmDU=; b=aGN/UE/4+FXMcyGVDf9Z+mfa9txb6SvuJQNlZN5CY0bzWS1yXXFtk3lSDTd3oRq6FW 3G0h75lKPAwR6xb37vK1zsKHsLCOecQ7eBawZI2fwJEb3dnKbimtnyQs8YG76fg7phGm nguJC1ciEg+0ZACvzZ23otDJsuslrmke1vYPGbevwIeMvzGe8MezQawRv7ZFAvcY908Y FT/VT4OXIypIYJ8CdXu88eOjJbXrM1BH3xym39dfho1l227mdcqjtb9WYbvDCU/IpyJl V/9C5k0kTWtNrDXcLYI4d6/bSBDb/AL3Z16zIBnCfnzax2FNP+QvY0HLlRFOj3l7Pg5q pqVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yILEQddT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u7si3114569plm.457.2021.10.04.06.37.17; Mon, 04 Oct 2021 06:37:17 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-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=@linuxfoundation.org header.s=korg header.b=yILEQddT; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238082AbhJDNjB (ORCPT + 11 others); Mon, 4 Oct 2021 09:39:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:48650 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238148AbhJDNh2 (ORCPT ); Mon, 4 Oct 2021 09:37:28 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6EDD36121F; Mon, 4 Oct 2021 13:16:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633353415; bh=ZO6zA9c8Lzwvtuu4Dipo711ge+UklH1aYIsTPUIsBKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yILEQddT1Zq8HIn/fU9T8qzyJqkbNXzmam7uwU5BwuWFu0UzIZFUdvIOs4EbtfCyU zr6FNgL3YBvsBCaWXJX5YM3lmSOUu08PYX/s3Shm9gNBpOmuf2lC6Lv1cLqbRe/BDj gfie/25RqchV48pNr5QgJ6tVV1Oo9GJ8K+yxgsOg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrew Lunn , Marek Vasut , Arnd Bergmann , "David S. Miller" , Sasha Levin Subject: [PATCH 5.14 119/172] net: ks8851: fix link error Date: Mon, 4 Oct 2021 14:52:49 +0200 Message-Id: <20211004125048.824493986@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125044.945314266@linuxfoundation.org> References: <20211004125044.945314266@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann [ Upstream commit 51bb08dd04a05035a64504faa47651d36b0f3125 ] An object file cannot be built for both loadable module and built-in use at the same time: arm-linux-gnueabi-ld: drivers/net/ethernet/micrel/ks8851_common.o: in function `ks8851_probe_common': ks8851_common.c:(.text+0xf80): undefined reference to `__this_module' Change the ks8851_common code to be a standalone module instead, and use Makefile logic to ensure this is built-in if at least one of its two users is. Fixes: 797047f875b5 ("net: ks8851: Implement Parallel bus operations") Link: https://lore.kernel.org/netdev/20210125121937.3900988-1-arnd@kernel.org/ Reviewed-by: Andrew Lunn Acked-by: Marek Vasut Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/micrel/Makefile | 6 ++---- drivers/net/ethernet/micrel/ks8851_common.c | 8 ++++++++ 2 files changed, 10 insertions(+), 4 deletions(-) -- 2.33.0 diff --git a/drivers/net/ethernet/micrel/Makefile b/drivers/net/ethernet/micrel/Makefile index 5cc00d22c708..6ecc4eb30e74 100644 --- a/drivers/net/ethernet/micrel/Makefile +++ b/drivers/net/ethernet/micrel/Makefile @@ -4,8 +4,6 @@ # obj-$(CONFIG_KS8842) += ks8842.o -obj-$(CONFIG_KS8851) += ks8851.o -ks8851-objs = ks8851_common.o ks8851_spi.o -obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o -ks8851_mll-objs = ks8851_common.o ks8851_par.o +obj-$(CONFIG_KS8851) += ks8851_common.o ks8851_spi.o +obj-$(CONFIG_KS8851_MLL) += ks8851_common.o ks8851_par.o obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c index 831518466de2..0f9c5457b93e 100644 --- a/drivers/net/ethernet/micrel/ks8851_common.c +++ b/drivers/net/ethernet/micrel/ks8851_common.c @@ -1057,6 +1057,7 @@ int ks8851_suspend(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_suspend); int ks8851_resume(struct device *dev) { @@ -1070,6 +1071,7 @@ int ks8851_resume(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_resume); #endif static int ks8851_register_mdiobus(struct ks8851_net *ks, struct device *dev) @@ -1243,6 +1245,7 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev, err_reg_io: return ret; } +EXPORT_SYMBOL_GPL(ks8851_probe_common); int ks8851_remove_common(struct device *dev) { @@ -1261,3 +1264,8 @@ int ks8851_remove_common(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_remove_common); + +MODULE_DESCRIPTION("KS8851 Network driver"); +MODULE_AUTHOR("Ben Dooks "); +MODULE_LICENSE("GPL");