| From c94020093fa2fa11fe4e556ead67f7d46ad9a3ae Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 18 Feb 2025 00:50:13 +0800 |
| Subject: HID: google: fix unused variable warning under !CONFIG_ACPI |
| |
| From: Yu-Chun Lin <eleanor15x@gmail.com> |
| |
| [ Upstream commit 4bd0725c09f377ffaf22b834241f6c050742e4fc ] |
| |
| As reported by the kernel test robot, the following warning occurs: |
| |
| >> drivers/hid/hid-google-hammer.c:261:36: warning: 'cbas_ec_acpi_ids' defined but not used [-Wunused-const-variable=] |
| 261 | static const struct acpi_device_id cbas_ec_acpi_ids[] = { |
| | ^~~~~~~~~~~~~~~~ |
| |
| The 'cbas_ec_acpi_ids' array is only used when CONFIG_ACPI is enabled. |
| Wrapping its definition and 'MODULE_DEVICE_TABLE' in '#ifdef CONFIG_ACPI' |
| prevents a compiler warning when ACPI is disabled. |
| |
| Fixes: eb1aac4c8744f75 ("HID: google: add support tablet mode switch for Whiskers") |
| Reported-by: kernel test robot <lkp@intel.com> |
| Closes: https://lore.kernel.org/oe-kbuild-all/202501201141.jctFH5eB-lkp@intel.com/ |
| Signed-off-by: Yu-Chun Lin <eleanor15x@gmail.com> |
| Signed-off-by: Jiri Kosina <jkosina@suse.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hid/hid-google-hammer.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c |
| index 0f292b5d3e26d..eb6fd2dc75d0a 100644 |
| --- a/drivers/hid/hid-google-hammer.c |
| +++ b/drivers/hid/hid-google-hammer.c |
| @@ -268,11 +268,13 @@ static void cbas_ec_remove(struct platform_device *pdev) |
| mutex_unlock(&cbas_ec_reglock); |
| } |
| |
| +#ifdef CONFIG_ACPI |
| static const struct acpi_device_id cbas_ec_acpi_ids[] = { |
| { "GOOG000B", 0 }, |
| { } |
| }; |
| MODULE_DEVICE_TABLE(acpi, cbas_ec_acpi_ids); |
| +#endif |
| |
| #ifdef CONFIG_OF |
| static const struct of_device_id cbas_ec_of_match[] = { |
| -- |
| 2.39.5 |
| |
