Re: [PATCH v2 1/2] tpm: st33zp24: Mark ACPI and OF related data as maybe unused

From: Jarkko Sakkinen
Date: Mon Mar 20 2023 - 09:49:19 EST


On Sun, Mar 19, 2023 at 03:13:53PM +0100, Krzysztof Kozlowski wrote:
> The driver can be compile tested with !CONFIG_OF or !CONFIG_ACPI making
> unused. This fixes compile tests with W=1 by annotating device ID table
> as possibly unused:
>
> drivers/char/tpm/st33zp24/i2c.c:141:34: error: ‘of_st33zp24_i2c_match’ defined but not used [-Werror=unused-const-variable=]
> drivers/char/tpm/st33zp24/spi.c:258:34: error: ‘of_st33zp24_spi_match’ defined but not used [-Werror=unused-const-variable=]
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
>
> ---
>
> Changes since v1:
> 1. Enhance commit msg.
> ---
> drivers/char/tpm/st33zp24/i2c.c | 4 ++--
> drivers/char/tpm/st33zp24/spi.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/char/tpm/st33zp24/i2c.c b/drivers/char/tpm/st33zp24/i2c.c
> index c4d0b744e3cc..2d28f55ef490 100644
> --- a/drivers/char/tpm/st33zp24/i2c.c
> +++ b/drivers/char/tpm/st33zp24/i2c.c
> @@ -138,13 +138,13 @@ static const struct i2c_device_id st33zp24_i2c_id[] = {
> };
> MODULE_DEVICE_TABLE(i2c, st33zp24_i2c_id);
>
> -static const struct of_device_id of_st33zp24_i2c_match[] = {
> +static const struct of_device_id of_st33zp24_i2c_match[] __maybe_unused = {
> { .compatible = "st,st33zp24-i2c", },
> {}
> };
> MODULE_DEVICE_TABLE(of, of_st33zp24_i2c_match);
>
> -static const struct acpi_device_id st33zp24_i2c_acpi_match[] = {
> +static const struct acpi_device_id st33zp24_i2c_acpi_match[] __maybe_unused = {
> {"SMO3324"},
> {}
> };
> diff --git a/drivers/char/tpm/st33zp24/spi.c b/drivers/char/tpm/st33zp24/spi.c
> index 2154059f0235..f5811b301d3b 100644
> --- a/drivers/char/tpm/st33zp24/spi.c
> +++ b/drivers/char/tpm/st33zp24/spi.c
> @@ -255,13 +255,13 @@ static const struct spi_device_id st33zp24_spi_id[] = {
> };
> MODULE_DEVICE_TABLE(spi, st33zp24_spi_id);
>
> -static const struct of_device_id of_st33zp24_spi_match[] = {
> +static const struct of_device_id of_st33zp24_spi_match[] __maybe_unused = {
> { .compatible = "st,st33zp24-spi", },
> {}
> };
> MODULE_DEVICE_TABLE(of, of_st33zp24_spi_match);
>
> -static const struct acpi_device_id st33zp24_spi_acpi_match[] = {
> +static const struct acpi_device_id st33zp24_spi_acpi_match[] __maybe_unused = {
> {"SMO3324"},
> {}
> };
> --
> 2.34.1
>

To both:

Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>

BR, Jarkko