LEDS_EXPRESSWIRE does not depend on NEW_LEDS in practice but still does
in Kconfig. Fix up its Kconfig entry to reflect this and fix a Kconfig
warning.
Signed-off-by: Duje Mihanović <[email protected]>
---
Duje Mihanović (2):
Revert "leds: Only descend into leds directory when CONFIG_NEW_LEDS is set"
leds: expresswire: don't depend on NEW_LEDS
drivers/Makefile | 2 +-
drivers/leds/Kconfig | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
---
base-commit: ae00c445390b349e070a64dc62f08aa878db7248
change-id: 20240212-expresswire-deps-e895e8da8ea3
Best regards,
--
Duje Mihanović <[email protected]>
The ExpressWire library does not depend on NEW_LEDS and selecting it
from a subsystem other than LEDs may cause Kconfig warnings:
WARNING: unmet direct dependencies detected for LEDS_EXPRESSWIRE
Depends on [n]: NEW_LEDS [=n] && GPIOLIB [=y]
Selected by [y]:
- BACKLIGHT_KTD2801 [=y] && HAS_IOMEM [=y] && BACKLIGHT_CLASS_DEVICE [=y]
Move it out of the "if NEW_LEDS" block to allow selection from other
subsystems (in particular backlight) without raising this warning.
Link: https://lore.kernel.org/[email protected]
Reported-by: Arnd Bergmann <[email protected]>
Suggested-by: Daniel Thompson <[email protected]>
Fixes: 25ae5f5f4168 ("leds: Introduce ExpressWire library")
Signed-off-by: Duje Mihanović <[email protected]>
---
drivers/leds/Kconfig | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 52328d295b4e..66998b938ed3 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -6,6 +6,12 @@ config LEDS_GPIO_REGISTER
As this function is used by arch code it must not be compiled as a
module.
+# This library does not depend on NEW_LEDS and must be independent so it can be
+# selected from other subsystems (specifically backlight).
+config LEDS_EXPRESSWIRE
+ bool
+ depends on GPIOLIB
+
menuconfig NEW_LEDS
bool "LED Support"
help
@@ -186,10 +192,6 @@ config LEDS_EL15203000
To compile this driver as a module, choose M here: the module
will be called leds-el15203000.
-config LEDS_EXPRESSWIRE
- bool
- depends on GPIOLIB
-
config LEDS_TURRIS_OMNIA
tristate "LED support for CZ.NIC's Turris Omnia"
depends on LEDS_CLASS_MULTICOLOR
--
2.43.1
This reverts commit b1ae40a5db6191c42e2e45d726407096f030ee08.
The ExpressWire library introduced in 25ae5f5f4168 ("leds: Introduce
ExpressWire library") does not depend on NEW_LEDS, but without this
revert it would never get compiled if NEW_LEDS is not enabled. Revert
this commit to allow the library to be compiled.
Link: https://lore.kernel.org/[email protected]
Suggested-by: Arnd Bergmann <[email protected]>
Signed-off-by: Duje Mihanović <[email protected]>
---
drivers/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 37fd6ce3bd7f..3bf5cab4b451 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -135,7 +135,7 @@ obj-$(CONFIG_CPU_IDLE) += cpuidle/
obj-y += mmc/
obj-y += ufs/
obj-$(CONFIG_MEMSTICK) += memstick/
-obj-$(CONFIG_NEW_LEDS) += leds/
+obj-y += leds/
obj-$(CONFIG_INFINIBAND) += infiniband/
obj-y += firmware/
obj-$(CONFIG_CRYPTO) += crypto/
--
2.43.1
On Mon, Feb 12, 2024 at 09:03:25PM +0100, Duje Mihanović wrote:
> This reverts commit b1ae40a5db6191c42e2e45d726407096f030ee08.
>
> The ExpressWire library introduced in 25ae5f5f4168 ("leds: Introduce
> ExpressWire library") does not depend on NEW_LEDS, but without this
> revert it would never get compiled if NEW_LEDS is not enabled. Revert
> this commit to allow the library to be compiled.
>
> Link: https://lore.kernel.org/[email protected]
> Suggested-by: Arnd Bergmann <[email protected]>
> Signed-off-by: Duje Mihanović <[email protected]>
Interesting that this could be a revert!
Reviewed-by: Daniel Thompson <[email protected]>
Daniel.
On Thursday, February 15, 2024 12:48:31 PM CET Daniel Thompson wrote:
> On Mon, Feb 12, 2024 at 09:03:26PM +0100, Duje Mihanović wrote:
...
> > Link: https://lore.kernel.org/[email protected]
> > Reported-by: Arnd Bergmann <[email protected]>
> > Suggested-by: Daniel Thompson <[email protected]>
> > Fixes: 25ae5f5f4168 ("leds: Introduce ExpressWire library")
> > Signed-off-by: Duje Mihanović <[email protected]>
>
> Reviewed-by: Daniel Thompson <[email protected]>
I must note that checkpatch actually complains about this patch (I may have
hit send too early):
0002-leds-expresswire-don-t-depend-on-NEW_LEDS.patch
----------------------------------------------------
WARNING: Reported-by: should be immediately followed by Closes: with a URL to
the report
#21:
Reported-by: Arnd Bergmann <[email protected]>
Suggested-by: Daniel Thompson <[email protected]>
total: 0 errors, 1 warnings, 22 lines checked
Could that Link: above be transformed into a Closes:?
Regards,
--
Duje
On Mon, Feb 12, 2024 at 09:03:26PM +0100, Duje Mihanović wrote:
> The ExpressWire library does not depend on NEW_LEDS and selecting it
> from a subsystem other than LEDs may cause Kconfig warnings:
>
> WARNING: unmet direct dependencies detected for LEDS_EXPRESSWIRE
> Depends on [n]: NEW_LEDS [=n] && GPIOLIB [=y]
> Selected by [y]:
> - BACKLIGHT_KTD2801 [=y] && HAS_IOMEM [=y] && BACKLIGHT_CLASS_DEVICE [=y]
>
> Move it out of the "if NEW_LEDS" block to allow selection from other
> subsystems (in particular backlight) without raising this warning.
>
> Link: https://lore.kernel.org/[email protected]
> Reported-by: Arnd Bergmann <[email protected]>
> Suggested-by: Daniel Thompson <[email protected]>
> Fixes: 25ae5f5f4168 ("leds: Introduce ExpressWire library")
> Signed-off-by: Duje Mihanović <[email protected]>
Reviewed-by: Daniel Thompson <[email protected]>
Daniel.