diff mbox

[v6,3/8] thunderbolt: Kconfig for Thunderbolt(TM) networking

Message ID 1470054233-4309-4-git-send-email-amir.jer.levy@intel.com
State Not Applicable, archived
Delegated to: David Miller
Headers show

Commit Message

Amir Levy Aug. 1, 2016, 12:23 p.m. UTC
Updating the Kconfig Thunderbolt(TM) description.

Signed-off-by: Amir Levy <amir.jer.levy@intel.com>
---
 drivers/thunderbolt/Kconfig  | 25 +++++++++++++++++++++----
 drivers/thunderbolt/Makefile |  2 +-
 2 files changed, 22 insertions(+), 5 deletions(-)

Comments

Greg KH Aug. 31, 2016, 11:29 a.m. UTC | #1
On Mon, Aug 01, 2016 at 03:23:48PM +0300, Amir Levy wrote:
> Updating the Kconfig Thunderbolt(TM) description.

Why are you inserting a (TM) in here?  Do you see that in any other
kernel Kconfig file?  Please don't start adding it here, it's not
needed from what I can tell.

thanks,

greg k-h
Greg KH Aug. 31, 2016, 11:30 a.m. UTC | #2
On Mon, Aug 01, 2016 at 03:23:48PM +0300, Amir Levy wrote:
> Updating the Kconfig Thunderbolt(TM) description.
> 
> Signed-off-by: Amir Levy <amir.jer.levy@intel.com>
> ---
>  drivers/thunderbolt/Kconfig  | 25 +++++++++++++++++++++----
>  drivers/thunderbolt/Makefile |  2 +-
>  2 files changed, 22 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
> index c121acc..d34b0f5 100644
> --- a/drivers/thunderbolt/Kconfig
> +++ b/drivers/thunderbolt/Kconfig
> @@ -1,13 +1,30 @@
> -menuconfig THUNDERBOLT
> -	tristate "Thunderbolt support for Apple devices"
> +config THUNDERBOLT
> +	tristate "Thunderbolt(TM) support"
>  	depends on PCI
>  	select CRC32
>  	help
> -	  Cactus Ridge Thunderbolt Controller driver
> +	  Thunderbolt(TM) Controller driver
> +
> +if THUNDERBOLT
> +
> +config THUNDERBOLT_APPLE
> +	tristate "Apple hardware support"

Wait, what?  What about my non-apple thunderbolt hardware?  Did that
just suddenly stop working?  Why rename this option?

greg k-h
diff mbox

Patch

diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig
index c121acc..d34b0f5 100644
--- a/drivers/thunderbolt/Kconfig
+++ b/drivers/thunderbolt/Kconfig
@@ -1,13 +1,30 @@ 
-menuconfig THUNDERBOLT
-	tristate "Thunderbolt support for Apple devices"
+config THUNDERBOLT
+	tristate "Thunderbolt(TM) support"
 	depends on PCI
 	select CRC32
 	help
-	  Cactus Ridge Thunderbolt Controller driver
+	  Thunderbolt(TM) Controller driver
+
+if THUNDERBOLT
+
+config THUNDERBOLT_APPLE
+	tristate "Apple hardware support"
+	help
 	  This driver is required if you want to hotplug Thunderbolt devices on
 	  Apple hardware.
 
 	  Device chaining is currently not supported.
 
-	  To compile this driver a module, choose M here. The module will be
+	  To compile this driver as a module, choose M here. The module will be
 	  called thunderbolt.
+
+config THUNDERBOLT_ICM
+	tristate "Thunderbolt(TM) Networking"
+	help
+	  This driver is required if you want Thunderbolt(TM) Networking on
+	  non-Apple hardware.
+
+	  To compile this driver as a module, choose M here. The module will be
+	  called thunderbolt_icm.
+
+endif
diff --git a/drivers/thunderbolt/Makefile b/drivers/thunderbolt/Makefile
index 5d1053c..7a85bd1 100644
--- a/drivers/thunderbolt/Makefile
+++ b/drivers/thunderbolt/Makefile
@@ -1,3 +1,3 @@ 
-obj-${CONFIG_THUNDERBOLT} := thunderbolt.o
+obj-${CONFIG_THUNDERBOLT_APPLE} := thunderbolt.o
 thunderbolt-objs := nhi.o ctl.o tb.o switch.o cap.o path.o tunnel_pci.o eeprom.o