Re: [PATCH 06/20] include: input: elan-i2c-ids: Mark 'elan_acpi_id' as __maybe_unused

Dmitry Torokhov
2020-11-04T22:51:00Z

Hi Lee,

On Wed, Nov 04, 2020 at 04:24:13PM +0000, Lee Jones wrote:
> Some drivers which include 'elan-i2c-ids.h' make use of
> 'elan_acpi_id', but not all do. Tell the compiler that this is
> expected behaviour.
>
> Fixes the following W=1 kernel build warning(s):
>
> include/linux/input/elan-i2c-ids.h:26:36: warning: ‘elan_acpi_id’ defined but not used [-Wunused-const-variable=]
>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Cc: dusonlin@emc.com.tw
> Cc: KT Liao <kt.liao@emc.com.tw>
> Cc: linux-input@vger.kernel.org
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
> include/linux/input/elan-i2c-ids.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/linux/input/elan-i2c-ids.h b/include/linux/input/elan-i2c-ids.h
> index 520858d126808..b6976d99b6b75 100644
> --- a/include/linux/input/elan-i2c-ids.h
> +++ b/include/linux/input/elan-i2c-ids.h
> @@ -23,7 +23,7 @@
>
> #include <linux/mod_devicetable.h>
>
> -static const struct acpi_device_id elan_acpi_id[] = {
> +static const struct acpi_device_id __maybe_unused elan_acpi_id[] = {
> { "ELAN0000", 0 },
> { "ELAN0100", 0 },
> { "ELAN0600", 0 },

I think I'd prefer something like this instead:

diff --git a/drivers/input/mouse/elan_i2c_core.c
b/drivers/input/mouse/elan_i2c_core.c
index c599e21a8478..65d21a050cea 100644
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -34,7 +34,6 @@
#include <linux/completion.h>
#include <linux/of.h>
#include <linux/property.h>
-#include <linux/input/elan-i2c-ids.h>
#include <linux/regulator/consumer.h>
#include <asm/unaligned.h>

@@ -1413,6 +1412,7 @@ static const struct i2c_device_id elan_id[] = {
MODULE_DEVICE_TABLE(i2c, elan_id);

#ifdef CONFIG_ACPI
+#include <linux/input/elan-i2c-ids.h>
MODULE_DEVICE_TABLE(acpi, elan_acpi_id);
#endif

Thanks.

--
Dmitry