crypto: Convert to new CPU match macros

The new macro set has a consistent namespace and uses C99 initializers
instead of the grufty C89 ones.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lkml.kernel.org/r/20200320131510.700250889@linutronix.de

diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
index bbbebbd35b5df6e0ea48a6d7f2b3a5a26b4d1815..75b6ea20491e36ae782f83880d74e84521a62dab 100644 (file)
--- a/arch/x86/crypto/aesni-intel_glue.c
+++ b/arch/x86/crypto/aesni-intel_glue.c
@@ -1064,7 +1064,7 @@ static struct aead_alg aesni_aeads[0];
 static struct simd_aead_alg *aesni_simd_aeads[ARRAY_SIZE(aesni_aeads)];
 
 static const struct x86_cpu_id aesni_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_AES),
+       X86_MATCH_FEATURE(X86_FEATURE_AES, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, aesni_cpu_id);

diff --git a/arch/x86/crypto/crc32-pclmul_glue.c b/arch/x86/crypto/crc32-pclmul_glue.c
index 418bd88acac8e74ea139aebbb92c5ff77590d27a..7c4c7b2fbf0599ce3dd85c497946f7c13489adfd 100644 (file)
--- a/arch/x86/crypto/crc32-pclmul_glue.c
+++ b/arch/x86/crypto/crc32-pclmul_glue.c
@@ -170,7 +170,7 @@ static struct shash_alg alg = {
 };
 
 static const struct x86_cpu_id crc32pclmul_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),
+       X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, crc32pclmul_cpu_id);

diff --git a/arch/x86/crypto/crc32c-intel_glue.c b/arch/x86/crypto/crc32c-intel_glue.c
index c20d1b8a82c38b7a5eab6c95480b4218953e9703..d2d069bd459bed1cc6d44f41f35960b73a43dc3e 100644 (file)
--- a/arch/x86/crypto/crc32c-intel_glue.c
+++ b/arch/x86/crypto/crc32c-intel_glue.c
@@ -221,7 +221,7 @@ static struct shash_alg alg = {
 };
 
 static const struct x86_cpu_id crc32c_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_XMM4_2),
+       X86_MATCH_FEATURE(X86_FEATURE_XMM4_2, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, crc32c_cpu_id);

diff --git a/arch/x86/crypto/crct10dif-pclmul_glue.c b/arch/x86/crypto/crct10dif-pclmul_glue.c
index 3c81e15b0873f7ed8a768435df0caf234da6922b..71291d5af9f4588b3811e05df7202975e7ede7e7 100644 (file)
--- a/arch/x86/crypto/crct10dif-pclmul_glue.c
+++ b/arch/x86/crypto/crct10dif-pclmul_glue.c
@@ -114,7 +114,7 @@ static struct shash_alg alg = {
 };
 
 static const struct x86_cpu_id crct10dif_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),
+       X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, crct10dif_cpu_id);

diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c
index a4b728518e28e5867ece03c8db470429c88bd155..1f1a95f3dd0ca6828077544c26c5cb45545c31b6 100644 (file)
--- a/arch/x86/crypto/ghash-clmulni-intel_glue.c
+++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -313,7 +313,7 @@ static struct ahash_alg ghash_async_alg = {
 };
 
 static const struct x86_cpu_id pcmul_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ), /* Pickle-Mickle-Duck */
+       X86_MATCH_FEATURE(X86_FEATURE_PCLMULQDQ, NULL), /* Pickle-Mickle-Duck */
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, pcmul_cpu_id);

diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c
index 594d6b1695d597575ed657b2a4d63dd6822feaf9..62c6fe88b21290138c3cd9b95a5d6e64f0f9aadf 100644 (file)
--- a/drivers/crypto/padlock-aes.c
+++ b/drivers/crypto/padlock-aes.c
@@ -474,7 +474,7 @@ static struct skcipher_alg cbc_aes_alg = {
 };
 
 static const struct x86_cpu_id padlock_cpu_id[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_XCRYPT),
+       X86_MATCH_FEATURE(X86_FEATURE_XCRYPT, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, padlock_cpu_id);

diff --git a/drivers/crypto/padlock-sha.c b/drivers/crypto/padlock-sha.c
index c826abe79e794d51c025989c3df7cd0a01f7b12f..a697a4a3f2d0d2fde7865c410059e443b1e90a3e 100644 (file)
--- a/drivers/crypto/padlock-sha.c
+++ b/drivers/crypto/padlock-sha.c
@@ -490,7 +490,7 @@ static struct shash_alg sha256_alg_nano = {
 };
 
 static const struct x86_cpu_id padlock_sha_ids[] = {
-       X86_FEATURE_MATCH(X86_FEATURE_PHE),
+       X86_MATCH_FEATURE(X86_FEATURE_PHE, NULL),
        {}
 };
 MODULE_DEVICE_TABLE(x86cpu, padlock_sha_ids);