[PATCH] macintosh/via-pmu: Fix build failure when CONFIG_INPUT is disabled

[Geert Uytterhoeven]

Hi Finn,

On Sat, Mar 19, 2022 at 5:23 AM Finn Thain <fthain at linux-m68k.org> wrote:
> drivers/macintosh/via-pmu-event.o: In function `via_pmu_event':
> via-pmu-event.c:(.text+0x44): undefined reference to `input_event'
> via-pmu-event.c:(.text+0x68): undefined reference to `input_event'
> via-pmu-event.c:(.text+0x94): undefined reference to `input_event'
> via-pmu-event.c:(.text+0xb8): undefined reference to `input_event'
> drivers/macintosh/via-pmu-event.o: In function `via_pmu_event_init':
> via-pmu-event.c:(.init.text+0x20): undefined reference to `input_allocate_device'
> via-pmu-event.c:(.init.text+0xc4): undefined reference to `input_register_device'
> via-pmu-event.c:(.init.text+0xd4): undefined reference to `input_free_device'
> make[1]: *** [Makefile:1155: vmlinux] Error 1
> make: *** [Makefile:350: __build_one_by_one] Error 2
>
> Don't call into the input subsystem unless CONFIG_INPUT is built-in.
>
> Reported-by: kernel test robot <lkp at intel.com>
> Cc: Michael Ellerman <mpe at ellerman.id.au>
> Cc: Geert Uytterhoeven <geert at linux-m68k.org>
> Signed-off-by: Finn Thain <fthain at linux-m68k.org>

Thanks for your patch!

> --- a/drivers/macintosh/Makefile
> +++ b/drivers/macintosh/Makefile
> @@ -12,7 +12,10 @@ obj-$(CONFIG_MAC_EMUMOUSEBTN)        += mac_hid.o
>  obj-$(CONFIG_INPUT_ADBHID)     += adbhid.o
>  obj-$(CONFIG_ANSLCD)           += ans-lcd.o
>
> -obj-$(CONFIG_ADB_PMU)          += via-pmu.o via-pmu-event.o
> +obj-$(CONFIG_ADB_PMU)          += via-pmu.o
> +ifeq ($(CONFIG_INPUT), y)
> +obj-$(CONFIG_ADB_PMU)          += via-pmu-event.o
> +endif

Alternatively, you can introduce an invisible Kconfig symbol that
is y if ADB_PMU && INPUT, to control the build of via-pmu.o.

>  obj-$(CONFIG_ADB_PMU_LED)      += via-pmu-led.o
>  obj-$(CONFIG_PMAC_BACKLIGHT)   += via-pmu-backlight.o
>  obj-$(CONFIG_ADB_CUDA)         += via-cuda.o
> diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
> index 4b98bc26a94b..55afa6dfa263 100644
> --- a/drivers/macintosh/via-pmu.c
> +++ b/drivers/macintosh/via-pmu.c
> @@ -1457,12 +1457,14 @@ pmu_handle_data(unsigned char *data, int len)
>                 if (pmu_battery_count)
>                         query_battery_state();
>                 pmu_pass_intr(data, len);
> +#ifdef CONFIG_INPUT
>                 /* len == 6 is probably a bad check. But how do I
>                  * know what PMU versions send what events here? */
>                 if (len == 6) {
>                         via_pmu_event(PMU_EVT_POWER, !!(data[1]&8));
>                         via_pmu_event(PMU_EVT_LID, data[1]&1);
>                 }
> +#endif

Additionally, if that new symbol is not enabled, a dummy via_pmu_event()
can be provided, so you don't need to add an #ifdef to the driver anymore.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds