net: Kconfig: move the CAN device menu to the "Device Drivers" section

The devices are meant to be under the "Device Drivers" category of the
menuconfig. The CAN subsystem is currently one of the rare exception
with all of its devices under the "Networking support" category.

The CAN_DEV menuentry gets moved to fix this discrepancy. The CAN menu
is added just before MCTP in order to be consistent with the current
order under the "Networking support" menu.

A dependency on CAN is added to CAN_DEV so that the CAN devices only
show up if the CAN subsystem is enabled.

Link: https://lore.kernel.org/all/20220610143009.323579-6-mailhol.vincent@wanadoo.fr
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Acked-by: Max Staudt <max@enpas.org>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index b2a4f998c180e9c72892724659c4e327db822d33..5de243899de8ff7af11fa0e8a6875e86aa125512 100644 (file)
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -499,6 +499,8 @@ config NET_SB1000
 
 source "drivers/net/phy/Kconfig"
 
+source "drivers/net/can/Kconfig"
+
 source "drivers/net/mctp/Kconfig"
 
 source "drivers/net/mdio/Kconfig"

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 5335f3afc0a55244e3545c9b051b99b213221ff6..806f15146f69f3c61029e190083e27adcf66570f 100644 (file)
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -3,6 +3,7 @@
 menuconfig CAN_DEV
        tristate "CAN Device Drivers"
        default y
+       depends on CAN
        help
          Controller Area Network (CAN) is serial communications protocol up to
          1Mbit/s for its original release (now known as Classical CAN) and up

diff --git a/net/can/Kconfig b/net/can/Kconfig
index a9ac5ffab286ac6aca7c15b52e83bdfcefe96dbb..cb56be8e386274b21d923a720847ab56fd5eeb10 100644 (file)
--- a/net/can/Kconfig
+++ b/net/can/Kconfig
@@ -15,7 +15,8 @@ menuconfig CAN
          PF_CAN is contained in <Documentation/networking/can.rst>.
 
          If you want CAN support you should say Y here and also to the
-         specific driver for your controller(s) below.
+         specific driver for your controller(s) under the Network device
+         support section.
 
 if CAN
 
@@ -69,6 +70,4 @@ config CAN_ISOTP
          If you want to perform automotive vehicle diagnostic services (UDS),
          say 'y'.
 
-source "drivers/net/can/Kconfig"
-
 endif