Skip to contentSkip to conversation

crypto: chacha - fix warning message in header file

PATCH In review Valdis Klētnieks 2 participants 2 messages Dec 6, 2019 – Dec 11, 2019 Crypto API

lore
Share & tools
lore

Valdis Klētnieks

author
#0 lore raw

PATCH 1/1 crypto: chacha - fix warning message in header file

Building with W=1 causes a warning:

CC [M] arch/x86/crypto/chacha_glue.o
In file included from arch/x86/crypto/chacha_glue.c:10:
./include/crypto/internal/chacha.h:37:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
37 | static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,

      | ^~~~~~

Straighten out the order to match the rest of the header file.

Signed-off-by Valdis Kletnieks <[email protected]>
include/crypto/internal/chacha.h +1 -1
index aa5d4a16aac5..b085dc1ac151 100644
@@ -34,7 +34,7 @@ static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
 	return chacha_setkey(tfm, key, keysize, 20);
 }
 
-static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
+static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
 				  unsigned int keysize)
 {
 	return chacha_setkey(tfm, key, keysize, 12);
include/crypto/internal/chacha.h +1 -1
index aa5d4a16aac5..b085dc1ac151 100644
@@ -34,7 +34,7 @@ static inline int chacha20_setkey(struct crypto_skcipher *tfm, const u8 *key,
 	return chacha_setkey(tfm, key, keysize, 20);
 }
 
-static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
+static inline int chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,
 				  unsigned int keysize)
 {
 	return chacha_setkey(tfm, key, keysize, 12);
maintainer
#1 lore raw
Quoted 11 lines · Valdis Klētnieks

Building with W=1 causes a warning:

CC [M] arch/x86/crypto/chacha_glue.o
In file included from arch/x86/crypto/chacha_glue.c:10:
./include/crypto/internal/chacha.h:37:1: warning: 'inline' is not at beginning of declaration [-Wold-style-declaration]
37 | static int inline chacha12_setkey(struct crypto_skcipher *tfm, const u8 *key,

      | ^~~~~~

Straighten out the order to match the rest of the header file.

Signed-off-by Valdis Kletnieks <[email protected]>

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt