]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
net: lan969x: fix cyclic dependency reported by depmod
authorDaniel Machon <daniel.machon@microchip.com>
Thu, 5 Dec 2024 13:54:24 +0000 (14:54 +0100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 Dec 2024 13:30:16 +0000 (13:30 +0000)
commit1cd7523f4baaf03026974553978210dc39e96665
tree65541a586fb5dce0b1fffa38ce7f844064a77af7
parent09310cfd4ea5c3ab2c7a610420205e0a1660bf7e
net: lan969x: fix cyclic dependency reported by depmod

Depmod reports a cyclic dependency between modules sparx5-switch.ko and
lan969x-switch.ko:

depmod: ERROR: Cycle detected: lan969x_switch -> sparx5_switch -> lan969x_switch
depmod: ERROR: Found 2 modules in dependency cycles!
make[2]: *** [scripts/Makefile.modinst:132: depmod] Error 1
make: *** [Makefile:224: __sub-make] Error 2

This makes sense, as they both require symbols from each other.

Fix this by compiling lan969x support into the sparx5-switch.ko module.
In order to do this, in a sensible way, we move the lan969x/ dir into
the sparx5/ dir and do some code cleanup of code that is no longer
required.

After this patch, depmod will no longer complain, as lan969x support is
compiled into the sparx5-swicth.ko module, and can no longer be compiled
as a standalone module.

Fixes: 98a01119608d ("net: sparx5: add compatible string for lan969x")
Signed-off-by: Daniel Machon <daniel.machon@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
16 files changed:
MAINTAINERS
drivers/net/ethernet/microchip/Kconfig
drivers/net/ethernet/microchip/Makefile
drivers/net/ethernet/microchip/lan969x/Kconfig [deleted file]
drivers/net/ethernet/microchip/lan969x/Makefile [deleted file]
drivers/net/ethernet/microchip/sparx5/Kconfig
drivers/net/ethernet/microchip/sparx5/Makefile
drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.c [moved from drivers/net/ethernet/microchip/lan969x/lan969x.c with 98% similarity]
drivers/net/ethernet/microchip/sparx5/lan969x/lan969x.h [moved from drivers/net/ethernet/microchip/lan969x/lan969x.h with 100% similarity]
drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_calendar.c [moved from drivers/net/ethernet/microchip/lan969x/lan969x_calendar.c with 100% similarity]
drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_regs.c [moved from drivers/net/ethernet/microchip/lan969x/lan969x_regs.c with 100% similarity]
drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_ag_api.c [moved from drivers/net/ethernet/microchip/lan969x/lan969x_vcap_ag_api.c with 100% similarity]
drivers/net/ethernet/microchip/sparx5/lan969x/lan969x_vcap_impl.c [moved from drivers/net/ethernet/microchip/lan969x/lan969x_vcap_impl.c with 100% similarity]
drivers/net/ethernet/microchip/sparx5/sparx5_calendar.c
drivers/net/ethernet/microchip/sparx5/sparx5_main.c
drivers/net/ethernet/microchip/sparx5/sparx5_ptp.c