From patchwork Mon Oct 4 12:52:50 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: 515199 Delivered-To: patch@linaro.org Received: by 2002:adf:fbc8:0:0:0:0:0 with SMTP id d8csp4344729wrs; Mon, 4 Oct 2021 06:23:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbX3WvxOA4BgaserlL2gjtGYWupm5XjllU2NpPVq2Vxr+9WiRSkirty/9uu0n/1wuyeZaQ X-Received: by 2002:a63:cc49:: with SMTP id q9mr11124636pgi.463.1633353794529; Mon, 04 Oct 2021 06:23:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633353794; cv=none; d=google.com; s=arc-20160816; b=faOcTeSHnX2rDho7AeXxyC5bFmp4MSV2FYJpavu5dX5ogVGkw3nS8HinEKVhPbS7IL 8jaTTwRCXlFhJyTkr/TqIQmInLDNzpRY+9PpxX4vy8sPgzj+zZqBltqHtbhF7auXvqZf 7rSgTWYo2ZfPzgg84pGSQ6WYEMA0FbvQ1h3zx9Kc3+g3jU6RJqkIIn7Nof0FqaTbm62F 3StqBVp9wPMb8V0Pqsw73dCGh1oiBRX+rq56w+4ssuANLBbAVweszX9DEGpcxeZ552fS yrlkEFi39135jUhclmqlLZOfk8OwqmlD+MXWJIQaUFQxU6fVIunKyr3fu7K31cDUw0GW u1jQ== 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=68CjRps8uozGVbjuFZTLg6HVnKFnmbIEQkHBU8d9+2s=; b=iiLsl9mc9TqwFsxNlcq6tLK8n6cXnT0QEWoJuFo6O66R1ZF2YV001H8RjxMxkGNK8v m07R/LVk1jqdF6uxecqjh/TFO8wVKe9q+LIX/Dzph9OE33uLB6fw0W8nXxpr3SeAFN+d dXlIZzT6TI9xexpASmpcrX9rbDA9EwpZXggvyhbVnfdvyoGRg6I+AAa9b82CROr0nRp/ xNNjO63EJCzhMTGkg8AbQtTTucXIGMOriKFjfqCnfeEnaKT0k/y/cge/Bq2ZqbZpBYrE N4Uj7dXe7LOtzXSrVqoLxVYbUwe89lr6wojvdVfHV8rL6ZaJLip9cslIxdfK6bRHuyT1 H8DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="QxxL3+/U"; 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 d1si22794798plh.304.2021.10.04.06.23.14; Mon, 04 Oct 2021 06:23:14 -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="QxxL3+/U"; 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 S236812AbhJDNZB (ORCPT + 11 others); Mon, 4 Oct 2021 09:25:01 -0400 Received: from mail.kernel.org ([198.145.29.99]:37214 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236863AbhJDNX0 (ORCPT ); Mon, 4 Oct 2021 09:23:26 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6005A61BE6; Mon, 4 Oct 2021 13:10:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633353009; bh=g6j03v111nugHzRuQGjslHZwzoMToh2SjGV/TP+k1b4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QxxL3+/UeNlagpIiOIDeGb+dvRo8hJ9WXgLwHfR2E47DjxOvQTLScyb5Ll5B/Qw7n oZUEHywpRBSzZH7uRJdtIZWAVLj1tMfW9AJuP8An6lgqQbK4uJtUQwKCNQj0glisQy ot1CktrY/ETeuaAj88yaQvugk94eIQwm/j4kb/D0= 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.10 52/93] net: ks8851: fix link error Date: Mon, 4 Oct 2021 14:52:50 +0200 Message-Id: <20211004125036.292908680@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211004125034.579439135@linuxfoundation.org> References: <20211004125034.579439135@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 d65872172229..f74eae8eed02 100644 --- a/drivers/net/ethernet/micrel/ks8851_common.c +++ b/drivers/net/ethernet/micrel/ks8851_common.c @@ -1031,6 +1031,7 @@ int ks8851_suspend(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_suspend); int ks8851_resume(struct device *dev) { @@ -1044,6 +1045,7 @@ int ks8851_resume(struct device *dev) return 0; } +EXPORT_SYMBOL_GPL(ks8851_resume); #endif int ks8851_probe_common(struct net_device *netdev, struct device *dev, @@ -1175,6 +1177,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) { @@ -1191,3 +1194,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");