mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH next] mux: fix build-error when mux-core is built as module
@ 2026-02-09 11:24 Josua Mayer
  2026-02-10 13:36 ` Ulf Hansson
  2026-02-11 11:42 ` Ulf Hansson
  0 siblings, 2 replies; 4+ messages in thread
From: Josua Mayer @ 2026-02-09 11:24 UTC (permalink / raw)
  To: Peter Rosin, Wolfram Sang, Ulf Hansson; +Cc: linux-kernel, Josua Mayer

The mux core header file uses ifdef CONFIG_MULTIPLEXER to select between
helper function prototypes and static inline stubs.

This leads to build errors when CONFIG_MULTIPLEXER=m, because then
CONFIG_MULTIPLEXER_MODULE is defined instead.

Replace the ifdef with IS_ENABLED to catch both builtin and module
cases, and fix the build error in module case.

Fixes: ad314348ceb4 ("mux: Add helper functions for getting optional and selected mux-state")
Signed-off-by: Josua Mayer <josua@solid-run.com>
---
 include/linux/mux/consumer.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
index 3ede55b907eb..a961861a503b 100644
--- a/include/linux/mux/consumer.h
+++ b/include/linux/mux/consumer.h
@@ -16,7 +16,7 @@ struct device;
 struct mux_control;
 struct mux_state;
 
-#ifdef CONFIG_MULTIPLEXER
+#if IS_ENABLED(CONFIG_MULTIPLEXER)
 
 unsigned int mux_control_states(struct mux_control *mux);
 int __must_check mux_control_select_delay(struct mux_control *mux,

---
base-commit: 13dc45d829d5ae06f6eee3fbd3cd1f6818c08e48
change-id: 20260209-rz-sdio-mux-fix-e8fa9c62ff95

Best regards,
-- 
Josua Mayer <josua@solid-run.com>



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH next] mux: fix build-error when mux-core is built as module
  2026-02-09 11:24 [PATCH next] mux: fix build-error when mux-core is built as module Josua Mayer
@ 2026-02-10 13:36 ` Ulf Hansson
  2026-02-10 13:45   ` Peter Rosin
  2026-02-11 11:42 ` Ulf Hansson
  1 sibling, 1 reply; 4+ messages in thread
From: Ulf Hansson @ 2026-02-10 13:36 UTC (permalink / raw)
  To: Peter Rosin, Josua Mayer; +Cc: Wolfram Sang, linux-kernel

On Mon, 9 Feb 2026 at 12:24, Josua Mayer <josua@solid-run.com> wrote:
>
> The mux core header file uses ifdef CONFIG_MULTIPLEXER to select between
> helper function prototypes and static inline stubs.
>
> This leads to build errors when CONFIG_MULTIPLEXER=m, because then
> CONFIG_MULTIPLEXER_MODULE is defined instead.
>
> Replace the ifdef with IS_ENABLED to catch both builtin and module
> cases, and fix the build error in module case.
>
> Fixes: ad314348ceb4 ("mux: Add helper functions for getting optional and selected mux-state")
> Signed-off-by: Josua Mayer <josua@solid-run.com>

Peter, do you intend to pick this up as a fix for v7.0-rc1? Otherwise,
I am of course happy to help with it!

Kind regards
Uffe

> ---
>  include/linux/mux/consumer.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
> index 3ede55b907eb..a961861a503b 100644
> --- a/include/linux/mux/consumer.h
> +++ b/include/linux/mux/consumer.h
> @@ -16,7 +16,7 @@ struct device;
>  struct mux_control;
>  struct mux_state;
>
> -#ifdef CONFIG_MULTIPLEXER
> +#if IS_ENABLED(CONFIG_MULTIPLEXER)
>
>  unsigned int mux_control_states(struct mux_control *mux);
>  int __must_check mux_control_select_delay(struct mux_control *mux,
>
> ---
> base-commit: 13dc45d829d5ae06f6eee3fbd3cd1f6818c08e48
> change-id: 20260209-rz-sdio-mux-fix-e8fa9c62ff95
>
> Best regards,
> --
> Josua Mayer <josua@solid-run.com>
>
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH next] mux: fix build-error when mux-core is built as module
  2026-02-10 13:36 ` Ulf Hansson
@ 2026-02-10 13:45   ` Peter Rosin
  0 siblings, 0 replies; 4+ messages in thread
From: Peter Rosin @ 2026-02-10 13:45 UTC (permalink / raw)
  To: Ulf Hansson, Josua Mayer; +Cc: Wolfram Sang, linux-kernel

Hi!

2026-02-10 at 14:36, Ulf Hansson wrote:
> On Mon, 9 Feb 2026 at 12:24, Josua Mayer <josua@solid-run.com> wrote:
>>
>> The mux core header file uses ifdef CONFIG_MULTIPLEXER to select between
>> helper function prototypes and static inline stubs.
>>
>> This leads to build errors when CONFIG_MULTIPLEXER=m, because then
>> CONFIG_MULTIPLEXER_MODULE is defined instead.
>>
>> Replace the ifdef with IS_ENABLED to catch both builtin and module
>> cases, and fix the build error in module case.
>>
>> Fixes: ad314348ceb4 ("mux: Add helper functions for getting optional and selected mux-state")
>> Signed-off-by: Josua Mayer <josua@solid-run.com>

Acked-by: Peter Rosin <peda@axentia.se>

> 
> Peter, do you intend to pick this up as a fix for v7.0-rc1? Otherwise,
> I am of course happy to help with it!

Be my guest :-)

Thanks,
Peter

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH next] mux: fix build-error when mux-core is built as module
  2026-02-09 11:24 [PATCH next] mux: fix build-error when mux-core is built as module Josua Mayer
  2026-02-10 13:36 ` Ulf Hansson
@ 2026-02-11 11:42 ` Ulf Hansson
  1 sibling, 0 replies; 4+ messages in thread
From: Ulf Hansson @ 2026-02-11 11:42 UTC (permalink / raw)
  To: Josua Mayer; +Cc: Peter Rosin, Wolfram Sang, linux-kernel

On Mon, 9 Feb 2026 at 12:24, Josua Mayer <josua@solid-run.com> wrote:
>
> The mux core header file uses ifdef CONFIG_MULTIPLEXER to select between
> helper function prototypes and static inline stubs.
>
> This leads to build errors when CONFIG_MULTIPLEXER=m, because then
> CONFIG_MULTIPLEXER_MODULE is defined instead.
>
> Replace the ifdef with IS_ENABLED to catch both builtin and module
> cases, and fix the build error in module case.
>
> Fixes: ad314348ceb4 ("mux: Add helper functions for getting optional and selected mux-state")
> Signed-off-by: Josua Mayer <josua@solid-run.com>

Applied for next (as a fix for v7.0-rc1), thanks!

Kind regards
Uffe

> ---
>  include/linux/mux/consumer.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/mux/consumer.h b/include/linux/mux/consumer.h
> index 3ede55b907eb..a961861a503b 100644
> --- a/include/linux/mux/consumer.h
> +++ b/include/linux/mux/consumer.h
> @@ -16,7 +16,7 @@ struct device;
>  struct mux_control;
>  struct mux_state;
>
> -#ifdef CONFIG_MULTIPLEXER
> +#if IS_ENABLED(CONFIG_MULTIPLEXER)
>
>  unsigned int mux_control_states(struct mux_control *mux);
>  int __must_check mux_control_select_delay(struct mux_control *mux,
>
> ---
> base-commit: 13dc45d829d5ae06f6eee3fbd3cd1f6818c08e48
> change-id: 20260209-rz-sdio-mux-fix-e8fa9c62ff95
>
> Best regards,
> --
> Josua Mayer <josua@solid-run.com>
>
>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2026-02-11 11:42 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-02-09 11:24 [PATCH next] mux: fix build-error when mux-core is built as module Josua Mayer
2026-02-10 13:36 ` Ulf Hansson
2026-02-10 13:45   ` Peter Rosin
2026-02-11 11:42 ` Ulf Hansson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®