Re: [PATCH] macintosh/via-pmu: Fix build failure when CONFIG_INPUT is disabled
From: Christophe Leroy <hidden>
Date: 2022-03-21 06:38:06
Also in:
lkml
Le 21/03/2022 à 05:30, Finn Thain a écrit :
quoted hunk ↗ jump to hunk
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 <redacted> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Randy Dunlap <redacted> Signed-off-by: Finn Thain <fthain@linux-m68k.org> --- This is equivalent to the patch I sent a couple of days ago. This one is slightly longer and adds a new symbol so that Kconfig logic can been used instead of Makefile logic in case reviewers prefer that. --- drivers/macintosh/Kconfig | 5 +++++ drivers/macintosh/Makefile | 3 ++- drivers/macintosh/via-pmu.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-)diff --git a/drivers/macintosh/Kconfig b/drivers/macintosh/Kconfig index 5cdc361da37c..b9102f051bbb 100644 --- a/drivers/macintosh/Kconfig +++ b/drivers/macintosh/Kconfig@@ -67,6 +67,11 @@ config ADB_PMU this device; you should do so if your machine is one of those mentioned above. +config ADB_PMU_EVENT + bool + depends on ADB_PMU && INPUT=y + default y
Could be reduced to config ADB_PMU_EVENT def_bool y if ADB_PMU && INPUT=y
quoted hunk ↗ jump to hunk
+ config ADB_PMU_LED bool "Support for the Power/iBook front LED" depends on PPC_PMAC && ADB_PMUdiff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile index 49819b1b6f20..712edcb3e0b0 100644 --- a/drivers/macintosh/Makefile +++ b/drivers/macintosh/Makefile@@ -12,7 +12,8 @@ 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 +obj-$(CONFIG_ADB_PMU_EVENT) += via-pmu-event.o obj-$(CONFIG_ADB_PMU_LED) += via-pmu-led.o obj-$(CONFIG_PMAC_BACKLIGHT) += via-pmu-backlight.o obj-$(CONFIG_ADB_CUDA) += via-cuda.odiff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index b1859e5340b3..022e2fd4397b 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c@@ -1468,12 +1468,14 @@ pmu_handle_data(unsigned char *data, int len) if (pmu_battery_count) query_battery_state(); pmu_pass_intr(data, len); +#ifdef CONFIG_ADB_PMU_EVENT /* len == 6 is probably a bad check. But how do I * know what PMU versions send what events here? */ if (len == 6) {
Can you replace that #ifdef stuff by
if (IS_ENABLED(CONFIG_ADB_PMU_EVENT) && len == 6) {
via_pmu_event(PMU_EVT_POWER, !!(data[1]&8)); via_pmu_event(PMU_EVT_LID, data[1]&1); } +#endif break; default: