[PATCH] qlcnic: clarify hwmon Kconfig dependency

[PATCH] qlcnic: clarify hwmon Kconfig dependency

[Arnd Bergmann]

commit 1f0f467b670e "qlcnic: Add hwmon interface to export board
temperature" introduced a randconfig build error in the case
when the hwmon framework is built as a module and the qlcnic
driver itself is built-in:

drivers/built-in.o: In function `qlcnic_register_hwmon_dev':
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1301: undefined reference to `hwmon_device_register_with_groups'
drivers/built-in.o: In function `qlcnic_unregister_hwmon_dev':
drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1309: undefined reference to `hwmon_device_unregister'

This changes the Kconfig logic to enforce that the qlcnic hwmon
support can only be enabled if it is possible to successfully
build it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Harish Patil <harish.patil@qlogic.com>

diff --git a/drivers/net/ethernet/qlogic/Kconfig b/drivers/net/ethernet/qlogic/Kconfig
index 0482adb..9493824 100644
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -69,6 +69,7 @@ config QLCNIC_VXLAN
 config QLCNIC_HWMON
 	bool "QLOGIC QLCNIC 82XX and 83XX family HWMON support"
 	depends on QLCNIC && HWMON
+	depends on QLCNIC=m || HWMON=y
 	default y
 	---help---
 	  This configuration parameter can be used to read the

Re: [PATCH] qlcnic: clarify hwmon Kconfig dependency

[Harish Patil]

>commit 1f0f467b670e "qlcnic: Add hwmon interface to export board
>temperature" introduced a randconfig build error in the case
>when the hwmon framework is built as a module and the qlcnic
>driver itself is built-in:
>
>drivers/built-in.o: In function `qlcnic_register_hwmon_dev':
>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1301: undefined
>reference to `hwmon_device_register_with_groups'
>drivers/built-in.o: In function `qlcnic_unregister_hwmon_dev':
>drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c:1309: undefined
>reference to `hwmon_device_unregister'
>
>This changes the Kconfig logic to enforce that the qlcnic hwmon
>support can only be enabled if it is possible to successfully
>build it.
>
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>Cc: Harish Patil <harish.patil@qlogic.com>
>
>diff --git a/drivers/net/ethernet/qlogic/Kconfig
>b/drivers/net/ethernet/qlogic/Kconfig
>index 0482adb..9493824 100644
>--- a/drivers/net/ethernet/qlogic/Kconfig
>+++ b/drivers/net/ethernet/qlogic/Kconfig
>@@ -69,6 +69,7 @@ config QLCNIC_VXLAN
> config QLCNIC_HWMON
>       bool "QLOGIC QLCNIC 82XX and 83XX family HWMON support"
>       depends on QLCNIC && HWMON
>+      depends on QLCNIC=m || HWMON=y
>       default y
>       ---help---
>         This configuration parameter can be used to read the
>
>
Can we make it into an one line expression as done in few other cases:

diff --git a/drivers/net/ethernet/qlogic/Kconfig
b/drivers/net/ethernet/qlogic/K
index b818432..d49cba1 100644
--- a/drivers/net/ethernet/qlogic/Kconfig
+++ b/drivers/net/ethernet/qlogic/Kconfig
@@ -68,7 +68,7 @@ config QLCNIC_VXLAN

 config QLCNIC_HWMON
        bool "QLOGIC QLCNIC 82XX and 83XX family HWMON support"
-       depends on QLCNIC && HWMON
+       depends on QLCNIC && HWMON && !(QLCNIC=y && HWMON=m)
        default y
        ---help---
          This configuration parameter can be used to read the




________________________________

This message and any attached documents contain information from QLogic Corporation or its wholly-owned subsidiaries that may be confidential. If you are not the intended recipient, you may not read, copy, distribute, or use this information. If you have received this transmission in error, please notify the sender immediately by reply e-mail and then delete this message.

Re: [PATCH] qlcnic: clarify hwmon Kconfig dependency

[David Miller]

From: Harish Patil <harish.patil@qlogic.com>
Date: Wed, 30 Apr 2014 15:51:27 +0000

> Can we make it into an one line expression as done in few other cases:
 ...
>         bool "QLOGIC QLCNIC 82XX and 83XX family HWMON support"
> -       depends on QLCNIC && HWMON
> +       depends on QLCNIC && HWMON && !(QLCNIC=y && HWMON=m)

Indeed this is much better and is consistent with what other driver
Kconfig entries use.

Can someone formally submit this without the email client patch
corruption and proper signoffs?

Thanks!