2022-03-19 07:12:38

by Randy Dunlap

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



On 3/18/22 21:18, Finn Thain 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 <[email protected]>
> Cc: Michael Ellerman <[email protected]>
> Cc: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Finn Thain <[email protected]>

Hi Finn,
It builds without those reported errors, but I do see these warnings
since the robot-supplied .config file has:
# CONFIG_PROC_FS is not set


CC drivers/macintosh/via-pmu.o
../drivers/macintosh/via-pmu.c:897:12: warning: 'pmu_battery_proc_show' defined but not used [-Wunused-function]
897 | static int pmu_battery_proc_show(struct seq_file *m, void *v)
| ^~~~~~~~~~~~~~~~~~~~~
../drivers/macintosh/via-pmu.c:871:12: warning: 'pmu_irqstats_proc_show' defined but not used [-Wunused-function]
871 | static int pmu_irqstats_proc_show(struct seq_file *m, void *v)
| ^~~~~~~~~~~~~~~~~~~~~~
../drivers/macintosh/via-pmu.c:860:12: warning: 'pmu_info_proc_show' defined but not used [-Wunused-function]
860 | static int pmu_info_proc_show(struct seq_file *m, void *v)
| ^~~~~~~~~~~~~~~~~~

> ---
> drivers/macintosh/Makefile | 5 ++++-
> drivers/macintosh/via-pmu.c | 2 ++
> 2 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/macintosh/Makefile b/drivers/macintosh/Makefile
> index 49819b1b6f20..eaf28b1c272f 100644
> --- 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
> 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
> break;
>
> default:

thanks.
--
~Randy


2022-03-21 22:07:33

by Finn Thain

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

On Fri, 18 Mar 2022, Randy Dunlap wrote:

>
> Hi Finn,
> It builds without those reported errors, but I do see these warnings
> since the robot-supplied .config file has:
> # CONFIG_PROC_FS is not set
>
>
> CC drivers/macintosh/via-pmu.o
> ../drivers/macintosh/via-pmu.c:897:12: warning: 'pmu_battery_proc_show' defined but not used [-Wunused-function]
> 897 | static int pmu_battery_proc_show(struct seq_file *m, void *v)
> | ^~~~~~~~~~~~~~~~~~~~~
> ../drivers/macintosh/via-pmu.c:871:12: warning: 'pmu_irqstats_proc_show' defined but not used [-Wunused-function]
> 871 | static int pmu_irqstats_proc_show(struct seq_file *m, void *v)
> | ^~~~~~~~~~~~~~~~~~~~~~
> ../drivers/macintosh/via-pmu.c:860:12: warning: 'pmu_info_proc_show' defined but not used [-Wunused-function]
> 860 | static int pmu_info_proc_show(struct seq_file *m, void *v)
> | ^~~~~~~~~~~~~~~~~~
>

I see. I'll send a separate patch for this issue.