* [PATCH v2 1/2] tpm: st33zp24: Mark ACPI and OF related data as maybe unused
@ 2023-03-19 14:13 Krzysztof Kozlowski
2023-03-19 14:13 ` [PATCH v2 2/2] tpm: tpm_tis_spi: " Krzysztof Kozlowski
2023-03-20 13:49 ` [PATCH v2 1/2] tpm: st33zp24: " Jarkko Sakkinen
0 siblings, 2 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2023-03-19 14:13 UTC (permalink / raw)
To: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, linux-integrity,
linux-kernel
Cc: Krzysztof Kozlowski
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@linaro.org>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH v2 2/2] tpm: tpm_tis_spi: Mark ACPI and OF related data as maybe unused
2023-03-19 14:13 [PATCH v2 1/2] tpm: st33zp24: Mark ACPI and OF related data as maybe unused Krzysztof Kozlowski
@ 2023-03-19 14:13 ` Krzysztof Kozlowski
2023-03-20 13:49 ` [PATCH v2 1/2] tpm: st33zp24: " Jarkko Sakkinen
1 sibling, 0 replies; 3+ messages in thread
From: Krzysztof Kozlowski @ 2023-03-19 14:13 UTC (permalink / raw)
To: Peter Huewe, Jarkko Sakkinen, Jason Gunthorpe, linux-integrity,
linux-kernel
Cc: Krzysztof Kozlowski
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/tpm_tis_spi_main.c:234:34: error: ‘of_tis_spi_match’ defined but not used [-Werror=unused-const-variable=]
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
Changes since v1:
1. Enhance commit msg.
---
drivers/char/tpm/tpm_tis_spi_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/char/tpm/tpm_tis_spi_main.c b/drivers/char/tpm/tpm_tis_spi_main.c
index a0963a3e92bd..1f5207974a17 100644
--- a/drivers/char/tpm/tpm_tis_spi_main.c
+++ b/drivers/char/tpm/tpm_tis_spi_main.c
@@ -231,7 +231,7 @@ static const struct spi_device_id tpm_tis_spi_id[] = {
};
MODULE_DEVICE_TABLE(spi, tpm_tis_spi_id);
-static const struct of_device_id of_tis_spi_match[] = {
+static const struct of_device_id of_tis_spi_match[] __maybe_unused = {
{ .compatible = "st,st33htpm-spi", .data = tpm_tis_spi_probe },
{ .compatible = "infineon,slb9670", .data = tpm_tis_spi_probe },
{ .compatible = "tcg,tpm_tis-spi", .data = tpm_tis_spi_probe },
@@ -240,7 +240,7 @@ static const struct of_device_id of_tis_spi_match[] = {
};
MODULE_DEVICE_TABLE(of, of_tis_spi_match);
-static const struct acpi_device_id acpi_tis_spi_match[] = {
+static const struct acpi_device_id acpi_tis_spi_match[] __maybe_unused = {
{"SMO0768", 0},
{}
};
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2 1/2] tpm: st33zp24: Mark ACPI and OF related data as maybe unused
2023-03-19 14:13 [PATCH v2 1/2] tpm: st33zp24: Mark ACPI and OF related data as maybe unused Krzysztof Kozlowski
2023-03-19 14:13 ` [PATCH v2 2/2] tpm: tpm_tis_spi: " Krzysztof Kozlowski
@ 2023-03-20 13:49 ` Jarkko Sakkinen
1 sibling, 0 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2023-03-20 13:49 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Peter Huewe, Jason Gunthorpe, linux-integrity, linux-kernel
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@linaro.org>
>
> ---
>
> 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@kernel.org>
BR, Jarkko
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-20 13:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-19 14:13 [PATCH v2 1/2] tpm: st33zp24: Mark ACPI and OF related data as maybe unused Krzysztof Kozlowski
2023-03-19 14:13 ` [PATCH v2 2/2] tpm: tpm_tis_spi: " Krzysztof Kozlowski
2023-03-20 13:49 ` [PATCH v2 1/2] tpm: st33zp24: " Jarkko Sakkinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).