[PATCH 0/5] clean up Kconfig + switch on CAN_RAW by default

[PATCH 0/5] clean up Kconfig + switch on CAN_RAW by default

[Marc Kleine-Budde]

Hello,

this patch series cleans up the Kconfig structure and switches on CAN_RAW by
default.

regards,
Marc

[PATCH 1/5] can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block

[Marc Kleine-Budde]

This patch adds an 'if CAN...endif' Block around all CAN symbols in
net/can/Kconfig. So the 'depends on CAN' dependencies can be removed.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/Kconfig |    5 -----
 net/can/Kconfig         |    7 ++++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index b56bd9e..8088d8f 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -1,9 +1,7 @@
 menu "CAN Device Drivers"
-	depends on CAN
 
 config CAN_VCAN
 	tristate "Virtual Local CAN Interface (vcan)"
-	depends on CAN
 	---help---
 	  Similar to the network loopback devices, vcan offers a
 	  virtual local CAN interface.
@@ -13,7 +11,6 @@ config CAN_VCAN
 
 config CAN_SLCAN
 	tristate "Serial / USB serial CAN Adaptors (slcan)"
-	depends on CAN
 	---help---
 	  CAN driver for several 'low cost' CAN interfaces that are attached
 	  via serial lines or via USB-to-serial adapters using the LAWICEL
@@ -33,7 +30,6 @@ config CAN_SLCAN
 
 config CAN_DEV
 	tristate "Platform CAN drivers with Netlink support"
-	depends on CAN
 	default y
 	---help---
 	  Enables the common framework for platform CAN drivers with Netlink
@@ -133,7 +129,6 @@ source "drivers/net/can/softing/Kconfig"
 
 config CAN_DEBUG_DEVICES
 	bool "CAN devices debugging messages"
-	depends on CAN
 	---help---
 	  Say Y here if you want the CAN device drivers to produce a bunch of
 	  debug messages to the system log.  Select this if you are having
diff --git a/net/can/Kconfig b/net/can/Kconfig
index 0320069..0435fc4 100644
--- a/net/can/Kconfig
+++ b/net/can/Kconfig
@@ -16,9 +16,10 @@ menuconfig CAN
 	  If you want CAN support you should say Y here and also to the
 	  specific driver for your controller(s) below.
 
+if CAN
+
 config CAN_RAW
 	tristate "Raw CAN Protocol (raw access with CAN-ID filtering)"
-	depends on CAN
 	default N
 	---help---
 	  The raw CAN protocol option offers access to the CAN bus via
@@ -29,7 +30,6 @@ config CAN_RAW
 
 config CAN_BCM
 	tristate "Broadcast Manager CAN Protocol (with content filtering)"
-	depends on CAN
 	default N
 	---help---
 	  The Broadcast Manager offers content filtering, timeout monitoring,
@@ -42,7 +42,6 @@ config CAN_BCM
 
 config CAN_GW
 	tristate "CAN Gateway/Router (with netlink configuration)"
-	depends on CAN
 	default N
 	---help---
 	  The CAN Gateway/Router is used to route (and modify) CAN frames.
@@ -53,3 +52,5 @@ config CAN_GW
 	  by the netlink configuration interface known e.g. from iptables.
 
 source "drivers/net/can/Kconfig"
+
+endif
-- 
1.7.10.4

[PATCH 2/5] can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' block

[Marc Kleine-Budde]

This patch adds an 'if CAN_DEV...endif' Block around the CAN driver
symbols in drivers/net/can/Kconfig. So the 'depends on CAN' dependencies
can be removed.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/Kconfig         |   21 ++++++++++++---------
 drivers/net/can/c_can/Kconfig   |    2 +-
 drivers/net/can/cc770/Kconfig   |    2 +-
 drivers/net/can/mscan/Kconfig   |    2 +-
 drivers/net/can/sja1000/Kconfig |    2 +-
 drivers/net/can/softing/Kconfig |    2 +-
 drivers/net/can/usb/Kconfig     |    2 +-
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index 8088d8f..0c5a656 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -36,9 +36,10 @@ config CAN_DEV
 	  support. This is the standard library for CAN drivers.
 	  If unsure, say Y.
 
+if CAN_DEV
+
 config CAN_CALC_BITTIMING
 	bool "CAN bit-timing calculation"
-	depends on CAN_DEV
 	default y
 	---help---
 	  If enabled, CAN bit-timing parameters will be calculated for the
@@ -52,13 +53,13 @@ config CAN_CALC_BITTIMING
 
 config CAN_AT91
 	tristate "Atmel AT91 onchip CAN controller"
-	depends on CAN_DEV && (ARCH_AT91SAM9263 || ARCH_AT91SAM9X5)
+	depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9X5
 	---help---
 	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
 	  and AT91SAM9X5 processors.
 
 config CAN_TI_HECC
-	depends on CAN_DEV && ARCH_OMAP3
+	depends on ARCH_OMAP3
 	tristate "TI High End CAN Controller"
 	---help---
 	  Driver for TI HECC (High End CAN Controller) module found on many
@@ -66,12 +67,12 @@ config CAN_TI_HECC
 
 config CAN_MCP251X
 	tristate "Microchip MCP251x SPI CAN controllers"
-	depends on CAN_DEV && SPI && HAS_DMA
+	depends on SPI && HAS_DMA
 	---help---
 	  Driver for the Microchip MCP251x SPI CAN controllers.
 
 config CAN_BFIN
-	depends on CAN_DEV && (BF534 || BF536 || BF537 || BF538 || BF539 || BF54x)
+	depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x
 	tristate "Analog Devices Blackfin on-chip CAN"
 	---help---
 	  Driver for the Analog Devices Blackfin on-chip CAN controllers
@@ -81,7 +82,7 @@ config CAN_BFIN
 
 config CAN_JANZ_ICAN3
 	tristate "Janz VMOD-ICAN3 Intelligent CAN controller"
-	depends on CAN_DEV && MFD_JANZ_CMODIO
+	depends on MFD_JANZ_CMODIO
 	---help---
 	  Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which
 	  connects to a MODULbus carrier board.
@@ -94,13 +95,13 @@ config HAVE_CAN_FLEXCAN
 
 config CAN_FLEXCAN
 	tristate "Support for Freescale FLEXCAN based chips"
-	depends on CAN_DEV && HAVE_CAN_FLEXCAN
+	depends on HAVE_CAN_FLEXCAN
 	---help---
 	  Say Y here if you want to support for Freescale FlexCAN.
 
 config PCH_CAN
 	tristate "Intel EG20T PCH CAN controller"
-	depends on CAN_DEV && PCI
+	depends on PCI
 	---help---
 	  This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which
 	  is an IOH for x86 embedded processor (Intel Atom E6xx series).
@@ -108,7 +109,7 @@ config PCH_CAN
 
 config CAN_GRCAN
 	tristate "Aeroflex Gaisler GRCAN and GRHCAN CAN devices"
-	depends on CAN_DEV && OF
+	depends on OF
 	---help---
 	  Say Y here if you want to use Aeroflex Gaisler GRCAN or GRHCAN.
 	  Note that the driver supports little endian, even though little
@@ -127,6 +128,8 @@ source "drivers/net/can/usb/Kconfig"
 
 source "drivers/net/can/softing/Kconfig"
 
+endif
+
 config CAN_DEBUG_DEVICES
 	bool "CAN devices debugging messages"
 	---help---
diff --git a/drivers/net/can/c_can/Kconfig b/drivers/net/can/c_can/Kconfig
index 3b83baf..61ffc12 100644
--- a/drivers/net/can/c_can/Kconfig
+++ b/drivers/net/can/c_can/Kconfig
@@ -1,6 +1,6 @@
 menuconfig CAN_C_CAN
 	tristate "Bosch C_CAN/D_CAN devices"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 
 if CAN_C_CAN
 
diff --git a/drivers/net/can/cc770/Kconfig b/drivers/net/can/cc770/Kconfig
index 22c07a8..6a9a5ba 100644
--- a/drivers/net/can/cc770/Kconfig
+++ b/drivers/net/can/cc770/Kconfig
@@ -1,6 +1,6 @@
 menuconfig CAN_CC770
 	tristate "Bosch CC770 and Intel AN82527 devices"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 
 if CAN_CC770
 
diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
index d387069..f19be52 100644
--- a/drivers/net/can/mscan/Kconfig
+++ b/drivers/net/can/mscan/Kconfig
@@ -1,5 +1,5 @@
 config CAN_MSCAN
-	depends on CAN_DEV && (PPC || M68K)
+	depends on PPC || M68K
 	tristate "Support for Freescale MSCAN based chips"
 	---help---
 	  The Motorola Scalable Controller Area Network (MSCAN) definition
diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 92f73c7..1bed54f 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -1,6 +1,6 @@
 menuconfig CAN_SJA1000
 	tristate "Philips/NXP SJA1000 devices"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 
 if CAN_SJA1000
 
diff --git a/drivers/net/can/softing/Kconfig b/drivers/net/can/softing/Kconfig
index 5de46a9..96b6fe1 100644
--- a/drivers/net/can/softing/Kconfig
+++ b/drivers/net/can/softing/Kconfig
@@ -1,6 +1,6 @@
 config CAN_SOFTING
 	tristate "Softing Gmbh CAN generic support"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 	---help---
 	  Support for CAN cards from Softing Gmbh & some cards
 	  from Vector Gmbh.
diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index a4e4bee..acba33d 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -1,5 +1,5 @@
 menu "CAN USB interfaces"
-	depends on USB && CAN_DEV
+	depends on USB
 
 config CAN_EMS_USB
 	tristate "EMS CPC-USB/ARM7 CAN/USB interface"
-- 
1.7.10.4

[PATCH 3/5] can: Kconfig: switch on CAN_RAW by default

[Marc Kleine-Budde]

As CAN_RAW is the basic CAN protocol, switch it on by default.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 net/can/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/can/Kconfig b/net/can/Kconfig
index 0435fc4..c017121 100644
--- a/net/can/Kconfig
+++ b/net/can/Kconfig
@@ -20,7 +20,7 @@ if CAN
 
 config CAN_RAW
 	tristate "Raw CAN Protocol (raw access with CAN-ID filtering)"
-	default N
+	default y
 	---help---
 	  The raw CAN protocol option offers access to the CAN bus via
 	  the BSD socket API. You probably want to use the raw socket in
-- 
1.7.10.4

Re: [PATCH 3/5] can: Kconfig: switch on CAN_RAW by default

[Oliver Hartkopp]

On 29.11.2012 14:58, Marc Kleine-Budde wrote:

> As CAN_RAW is the basic CAN protocol, switch it on by default.
> 


Hello Marc,

you are probably right, that most users will at least need CAN_RAW sockets.
But i asked myself, what the Linux distributions will do once we point out
that a specific protocol is *preferred* to be enabled?

Regards,
Oliver

> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
>  net/can/Kconfig |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/net/can/Kconfig b/net/can/Kconfig
> index 0435fc4..c017121 100644
> --- a/net/can/Kconfig
> +++ b/net/can/Kconfig
> @@ -20,7 +20,7 @@ if CAN
>  
>  config CAN_RAW
>  	tristate "Raw CAN Protocol (raw access with CAN-ID filtering)"
> -	default N
> +	default y
>  	---help---
>  	  The raw CAN protocol option offers access to the CAN bus via
>  	  the BSD socket API. You probably want to use the raw socket in

Re: [PATCH 3/5] can: Kconfig: switch on CAN_RAW by default

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 806 bytes --]

On 11/30/2012 07:47 AM, Oliver Hartkopp wrote:
> On 29.11.2012 14:58, Marc Kleine-Budde wrote:
> 
>> As CAN_RAW is the basic CAN protocol, switch it on by default.
>>
> 
> 
> Hello Marc,
> 
> you are probably right, that most users will at least need CAN_RAW sockets.
> But i asked myself, what the Linux distributions will do once we point out
> that a specific protocol is *preferred* to be enabled?

I hope they enable it by default. However CAN_RAW will be only switched
on, if CAN support is enabled.

Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]

Re: [PATCH 3/5] can: Kconfig: switch on CAN_RAW by default

[Oliver Hartkopp]

On 30.11.2012 09:19, Marc Kleine-Budde wrote:

> On 11/30/2012 07:47 AM, Oliver Hartkopp wrote:
>> On 29.11.2012 14:58, Marc Kleine-Budde wrote:
>>
>>> As CAN_RAW is the basic CAN protocol, switch it on by default.
>>>
>>
>>
>> Hello Marc,
>>
>> you are probably right, that most users will at least need CAN_RAW sockets.
>> But i asked myself, what the Linux distributions will do once we point out
>> that a specific protocol is *preferred* to be enabled?
> 
> I hope they enable it by default. However CAN_RAW will be only switched
> on, if CAN support is enabled.
> 

Yes, if CAN support is enabled.

The problem is that when it's enabled - what to select then?

IMO all entries (RAW/BCM/GW) should be enabled by default when CAN is
selected. When people really know what they do, the might deselect entries at
their own risc ...

Regards,
Oliver

Re: [PATCH 3/5] can: Kconfig: switch on CAN_RAW by default

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 1578 bytes --]

On 11/30/2012 06:02 PM, Oliver Hartkopp wrote:
> On 30.11.2012 09:19, Marc Kleine-Budde wrote:
> 
>> On 11/30/2012 07:47 AM, Oliver Hartkopp wrote:
>>> On 29.11.2012 14:58, Marc Kleine-Budde wrote:
>>>
>>>> As CAN_RAW is the basic CAN protocol, switch it on by default.
>>>>
>>>
>>>
>>> Hello Marc,
>>>
>>> you are probably right, that most users will at least need CAN_RAW sockets.
>>> But i asked myself, what the Linux distributions will do once we point out
>>> that a specific protocol is *preferred* to be enabled?
>>
>> I hope they enable it by default. However CAN_RAW will be only switched
>> on, if CAN support is enabled.
>>
> 
> Yes, if CAN support is enabled.
> 
> The problem is that when it's enabled - what to select then?

Sorry, I don't get what you're trying to tell me.

With my patch, if you switch on CAN support, CAN_RAW will be enabled by
default. My rationale behind is, that CAN support is pretty useless
without CAN_RAW support.

> IMO all entries (RAW/BCM/GW) should be enabled by default when CAN is
> selected. When people really know what they do, the might deselect entries at
> their own risc ...

YMMV, BCM and GW are for experienced can users. But I can change the
patch to enable RAW, BCM and GW on by default.

regards,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 261 bytes --]

Re: [PATCH 3/5] can: Kconfig: switch on CAN_RAW by default

[Oliver Hartkopp]

On 03.12.2012 14:39, Marc Kleine-Budde wrote:

> On 11/30/2012 06:02 PM, Oliver Hartkopp wrote:


>> IMO all entries (RAW/BCM/GW) should be enabled by default when CAN is
>> selected. When people really know what they do, the might deselect entries at
>> their own risc ...
> 
> YMMV, BCM and GW are for experienced can users. But I can change the
> patch to enable RAW, BCM and GW on by default.


That would be ok!

The problem is, when an application from an experienced CAN developer hits a
Linux-box from an inexperienced user.

Trying to help this user to compile / install the missing protocols is a mess.
So having all 'enabled' by default once CAN is selected is much better.

Tnx,
Oliver

[PATCH 4/5] can: Kconfig: remove 'default n' from CAN_BCM and CAN_GW

[Marc Kleine-Budde]

As 'default n' is already default, remove it.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 net/can/Kconfig |    2 --
 1 file changed, 2 deletions(-)

diff --git a/net/can/Kconfig b/net/can/Kconfig
index c017121..0d52416 100644
--- a/net/can/Kconfig
+++ b/net/can/Kconfig
@@ -30,7 +30,6 @@ config CAN_RAW
 
 config CAN_BCM
 	tristate "Broadcast Manager CAN Protocol (with content filtering)"
-	default N
 	---help---
 	  The Broadcast Manager offers content filtering, timeout monitoring,
 	  sending of RTR frames, and cyclic CAN messages without permanent user
@@ -42,7 +41,6 @@ config CAN_BCM
 
 config CAN_GW
 	tristate "CAN Gateway/Router (with netlink configuration)"
-	default N
 	---help---
 	  The CAN Gateway/Router is used to route (and modify) CAN frames.
 	  It is based on the PF_CAN core infrastructure for msg filtering and
-- 
1.7.10.4

[PATCH 5/5] can: sja1000: correct indention of Kconfig help text

[Marc Kleine-Budde]

This patch changes the indention of the Kconfig help text to the default
<tab> + 2 <space>.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/sja1000/Kconfig |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
index 1bed54f..b39ca5b 100644
--- a/drivers/net/can/sja1000/Kconfig
+++ b/drivers/net/can/sja1000/Kconfig
@@ -99,11 +99,11 @@ config CAN_TSCAN1
 	tristate "TS-CAN1 PC104 boards"
 	depends on ISA
 	help
-	This driver is for Technologic Systems' TSCAN-1 PC104 boards.
-	http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1
-	The driver supports multiple boards and automatically configures them:
-	PLD IO base addresses are read from jumpers JP1 and JP2,
-	IRQ numbers are read from jumpers JP4 and JP5,
-	SJA1000 IO base addresses are chosen heuristically (first that works).
+	  This driver is for Technologic Systems' TSCAN-1 PC104 boards.
+	  http://www.embeddedarm.com/products/board-detail.php?product=TS-CAN1
+	  The driver supports multiple boards and automatically configures them:
+	  PLD IO base addresses are read from jumpers JP1 and JP2,
+	  IRQ numbers are read from jumpers JP4 and JP5,
+	  SJA1000 IO base addresses are chosen heuristically (first that works).
 
 endif
-- 
1.7.10.4