* [PATCH] crypto: chacha - fix warning message in header file
@ 2019-12-06 1:58 Valdis Klētnieks
2019-12-11 9:45 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: Valdis Klētnieks @ 2019-12-06 1:58 UTC (permalink / raw)
To: Herbert Xu, David S. Miller, Ard Biesheuvel; +Cc: linux-crypto, linux-kernel
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 <valdis.kletnieks@vt.edu>
diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h
index aa5d4a16aac5..b085dc1ac151 100644
--- a/include/crypto/internal/chacha.h
+++ b/include/crypto/internal/chacha.h
@@ -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);
diff --git a/include/crypto/internal/chacha.h b/include/crypto/internal/chacha.h
index aa5d4a16aac5..b085dc1ac151 100644
--- a/include/crypto/internal/chacha.h
+++ b/include/crypto/internal/chacha.h
@@ -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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] crypto: chacha - fix warning message in header file
2019-12-06 1:58 [PATCH] crypto: chacha - fix warning message in header file Valdis Klētnieks
@ 2019-12-11 9:45 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2019-12-11 9:45 UTC (permalink / raw)
To: Valdis Klētnieks
Cc: David S. Miller, Ard Biesheuvel, linux-crypto, linux-kernel
On Thu, Dec 05, 2019 at 08:58:36PM -0500, Valdis Klētnieks wrote:
> 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 <valdis.kletnieks@vt.edu>
Patch applied. Thanks.
--
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-12-11 9:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-06 1:58 [PATCH] crypto: chacha - fix warning message in header file Valdis Klētnieks
2019-12-11 9:45 ` Herbert Xu
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).