2021-05-27 06:36:33

by Austin Kim

Subject: [PATCH] crypto: arm64/gcm - remove Wunused-const-variable ghash_cpu_feature

GCC compiler complains with below messages.

warning: ‘ghash_cpu_feature’ defined but not used [-Wunused-const-variable=]
static const struct cpu_feature ghash_cpu_feature[] = {
^~~~~~~~~~~~~~~~~

The variable with MODULE_DEVICE_TABLE() is registered as platform_driver.
But ghash_cpu_feature is not used, so remove ghash_cpu_feature.

Signed-off-by: Austin Kim <[email protected]>
---
arch/arm64/crypto/ghash-ce-glue.c | 5 -----
1 file changed, 5 deletions(-)

diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
index 720cd3a58da3..c3f27d0d5329 100644
--- a/arch/arm64/crypto/ghash-ce-glue.c
+++ b/arch/arm64/crypto/ghash-ce-glue.c
@@ -615,10 +615,5 @@ static void __exit ghash_ce_mod_exit(void)
crypto_unregister_shash(&ghash_alg);
}

-static const struct cpu_feature ghash_cpu_feature[] = {
- { cpu_feature(PMULL) }, { }
-};
-MODULE_DEVICE_TABLE(cpu, ghash_cpu_feature);
-
module_init(ghash_ce_mod_init);
module_exit(ghash_ce_mod_exit);
--
2.20.1

2021-05-27 19:04:05

by Eric Biggers

Subject: Re: [PATCH] crypto: arm64/gcm - remove Wunused-const-variable ghash_cpu_feature

On Thu, May 27, 2021 at 07:28:09AM +0100, Austin Kim wrote:
>
> The variable with MODULE_DEVICE_TABLE() is registered as platform_driver.

What does this mean? There is no platform_driver involved here at all.

> But ghash_cpu_feature is not used, so remove ghash_cpu_feature.

It is used when the file is built as a module.

> diff --git a/arch/arm64/crypto/ghash-ce-glue.c b/arch/arm64/crypto/ghash-ce-glue.c
> index 720cd3a58da3..c3f27d0d5329 100644
> --- a/arch/arm64/crypto/ghash-ce-glue.c
> +++ b/arch/arm64/crypto/ghash-ce-glue.c
> @@ -615,10 +615,5 @@ static void __exit ghash_ce_mod_exit(void)
> crypto_unregister_shash(&ghash_alg);
> }
>
> -static const struct cpu_feature ghash_cpu_feature[] = {
> - { cpu_feature(PMULL) }, { }
> -};
> -MODULE_DEVICE_TABLE(cpu, ghash_cpu_feature);
> -

Probably adding __maybe_unused to ghash_cpu_feature[] is the right thing to do.
That's what module_cpu_feature_match() does.

(Note that module_cpu_feature_match() can't be used here, as it seems the intent
is for this module to be autoloaded when PMULL is detected, but still be
loadable without it. So, that's apparently the reason for using
MODULE_DEVICE_TABLE() directly.)

- Eric