TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: ks8851: fix link error

Browse Source 
[ Upstream commit 51bb08dd04 ]

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: 797047f875 ("net: ks8851: Implement Parallel bus operations")
Link: https://lore.kernel.org/netdev/20210125121937.3900988-1-arnd@kernel.org/
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Marek Vasut <marex@denx.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Arnd Bergmann
2021-09-27 16:13:02 +02:00
committed by Greg Kroah-Hartman
parent f1dd6e10f0
commit 1f2ca30fbd
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/ethernet/micrel/Makefile
+2 -4
View File
@@ -4,8 +4,6 @@
# #
obj-$(CONFIG_KS8842) += ks8842.o obj-$(CONFIG_KS8842) += ks8842.o
obj-$(CONFIG_KS8851) += ks8851.o obj-$(CONFIG_KS8851) += ks8851_common.o ks8851_spi.o
ks8851-objs = ks8851_common.o ks8851_spi.o obj-$(CONFIG_KS8851_MLL) += ks8851_common.o ks8851_par.o
obj-$(CONFIG_KS8851_MLL) += ks8851_mll.o
ks8851_mll-objs = ks8851_common.o ks8851_par.o
obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o obj-$(CONFIG_KSZ884X_PCI) += ksz884x.o
drivers/net/ethernet/micrel/ks8851_common.c
+8
View File
@@ -1031,6 +1031,7 @@ int ks8851_suspend(struct device *dev)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ks8851_suspend);
int ks8851_resume(struct device *dev) int ks8851_resume(struct device *dev)
{ {
@@ -1044,6 +1045,7 @@ int ks8851_resume(struct device *dev)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ks8851_resume);
#endif #endif
int ks8851_probe_common(struct net_device *netdev, struct device *dev, int ks8851_probe_common(struct net_device *netdev, struct device *dev,
@@ -1175,6 +1177,7 @@ err_reg:
err_reg_io: err_reg_io:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(ks8851_probe_common);
int ks8851_remove_common(struct device *dev) int ks8851_remove_common(struct device *dev)
{ {
@@ -1191,3 +1194,8 @@ int ks8851_remove_common(struct device *dev)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(ks8851_remove_common);
MODULE_DESCRIPTION("KS8851 Network driver");
MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
MODULE_LICENSE("GPL");