[PATCH] crypto: qcom-rng - Fix qcom_rng_of_match unused warning

[PATCH] crypto: qcom-rng - Fix qcom_rng_of_match unused warning

[Herbert Xu]

On Sun, Jul 24, 2022 at 08:12:39AM +0800, kernel test robot wrote:
>
> >> drivers/crypto/qcom-rng.c:190:34: warning: 'qcom_rng_of_match' defined but not used [-Wunused-const-variable=]
>      190 | static const struct of_device_id qcom_rng_of_match[] = {
>          |                                  ^~~~~~~~~~~~~~~~~

---8<---
Module device tables need to be declared as maybe_unused because
they will be unused when built-in and the corresponding option is
also disabled.

This patch adds the maybe_unused attributes to OF and ACPI.  This
also allows us to remove the ifdef around the ACPI data structure.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c
index 031b5f701a0a..72dd1a4ebac4 100644
--- a/drivers/crypto/qcom-rng.c
+++ b/drivers/crypto/qcom-rng.c
@@ -9,6 +9,7 @@
 #include <linux/crypto.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/platform_device.h>
@@ -201,15 +202,13 @@ static int qcom_rng_remove(struct platform_device *pdev)
 	return 0;
 }
 
-#if IS_ENABLED(CONFIG_ACPI)
-static const struct acpi_device_id qcom_rng_acpi_match[] = {
+static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = {
 	{ .id = "QCOM8160", .driver_data = 1 },
 	{}
 };
 MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match);
-#endif
 
-static const struct of_device_id qcom_rng_of_match[] = {
+static const struct of_device_id __maybe_unused qcom_rng_of_match[] = {
 	{ .compatible = "qcom,prng", .data = (void *)0},
 	{ .compatible = "qcom,prng-ee", .data = (void *)1},
 	{}
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH] crypto: qcom-rng - Fix qcom_rng_of_match unused warning

[Vinod Koul]

On 29-07-22, 17:35, Herbert Xu wrote:
> On Sun, Jul 24, 2022 at 08:12:39AM +0800, kernel test robot wrote:
> >
> > >> drivers/crypto/qcom-rng.c:190:34: warning: 'qcom_rng_of_match' defined but not used [-Wunused-const-variable=]
> >      190 | static const struct of_device_id qcom_rng_of_match[] = {
> >          |                                  ^~~~~~~~~~~~~~~~~
> 
> ---8<---
> Module device tables need to be declared as maybe_unused because
> they will be unused when built-in and the corresponding option is
> also disabled.
> 
> This patch adds the maybe_unused attributes to OF and ACPI.  This
> also allows us to remove the ifdef around the ACPI data structure.

Reviewed-by: Vinod Koul <vkoul@kernel.org>

> 
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> 
> diff --git a/drivers/crypto/qcom-rng.c b/drivers/crypto/qcom-rng.c
> index 031b5f701a0a..72dd1a4ebac4 100644
> --- a/drivers/crypto/qcom-rng.c
> +++ b/drivers/crypto/qcom-rng.c
> @@ -9,6 +9,7 @@
>  #include <linux/crypto.h>
>  #include <linux/io.h>
>  #include <linux/iopoll.h>
> +#include <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/of.h>
>  #include <linux/platform_device.h>
> @@ -201,15 +202,13 @@ static int qcom_rng_remove(struct platform_device *pdev)
>  	return 0;
>  }
>  
> -#if IS_ENABLED(CONFIG_ACPI)
> -static const struct acpi_device_id qcom_rng_acpi_match[] = {
> +static const struct acpi_device_id __maybe_unused qcom_rng_acpi_match[] = {
>  	{ .id = "QCOM8160", .driver_data = 1 },
>  	{}
>  };
>  MODULE_DEVICE_TABLE(acpi, qcom_rng_acpi_match);
> -#endif
>  
> -static const struct of_device_id qcom_rng_of_match[] = {
> +static const struct of_device_id __maybe_unused qcom_rng_of_match[] = {
>  	{ .compatible = "qcom,prng", .data = (void *)0},
>  	{ .compatible = "qcom,prng-ee", .data = (void *)1},
>  	{}
> -- 
> Email: Herbert Xu <herbert@gondor.apana.org.au>
> Home Page: http://gondor.apana.org.au/~herbert/
> PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

-- 
~Vinod