diff options
| author | Eric Biggers <ebiggers@kernel.org> | 2026-05-22 00:30:27 -0500 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2026-05-28 17:45:46 -0700 |
| commit | 9d58d14e3a18a966988f4a9afe5a72c02eec4c20 (patch) | |
| tree | 6d141751d8c455b39d3ca9610dc4fc8a0a811f68 /crypto | |
| parent | 3065170bfc7f256f9d1339062dae331f731c6763 (diff) | |
| download | linux-9d58d14e3a18a966988f4a9afe5a72c02eec4c20.tar.gz linux-9d58d14e3a18a966988f4a9afe5a72c02eec4c20.zip | |
crypto: api - Fold __crypto_alloc_tfmgfp() into __crypto_alloc_tfm()
This reverts commit fa3b3565f3ac ("crypto: api - Add
__crypto_alloc_tfmgfp").
Fold __crypto_alloc_tfmgfp() into its only remaining caller,
__crypto_alloc_tfm(). Previously __crypto_alloc_tfmgfp() was called by
crypto_clone_cipher(), but crypto_clone_cipher() was removed.
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Link: https://patch.msgid.link/20260522053028.91165-6-ebiggers@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/api.c | 13 | ||||
| -rw-r--r-- | crypto/internal.h | 2 |
2 files changed, 3 insertions, 12 deletions
diff --git a/crypto/api.c b/crypto/api.c index be9ee104ffc2..5bd0db7fa665 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -405,15 +405,15 @@ void crypto_shoot_alg(struct crypto_alg *alg) } EXPORT_SYMBOL_GPL(crypto_shoot_alg); -struct crypto_tfm *__crypto_alloc_tfmgfp(struct crypto_alg *alg, u32 type, - u32 mask, gfp_t gfp) +struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, + u32 mask) { struct crypto_tfm *tfm; unsigned int tfm_size; int err = -ENOMEM; tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, type, mask); - tfm = kzalloc(tfm_size, gfp); + tfm = kzalloc(tfm_size, GFP_KERNEL); if (tfm == NULL) goto out_err; @@ -434,13 +434,6 @@ out_err: out: return tfm; } -EXPORT_SYMBOL_GPL(__crypto_alloc_tfmgfp); - -struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, - u32 mask) -{ - return __crypto_alloc_tfmgfp(alg, type, mask, GFP_KERNEL); -} EXPORT_SYMBOL_GPL(__crypto_alloc_tfm); /* diff --git a/crypto/internal.h b/crypto/internal.h index b6e437f463d4..b0a10986f61e 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -119,8 +119,6 @@ void crypto_remove_spawns(struct crypto_alg *alg, struct list_head *list, struct crypto_alg *nalg); void crypto_remove_final(struct list_head *list); void crypto_shoot_alg(struct crypto_alg *alg); -struct crypto_tfm *__crypto_alloc_tfmgfp(struct crypto_alg *alg, u32 type, - u32 mask, gfp_t gfp); struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type, u32 mask); void *crypto_create_tfm_node(struct crypto_alg *alg, |