crypto: cryptd - Remove unused functions

Many functions in cryptd.c no longer have any caller.  Remove them.

Also remove several associated structs and includes.  Finally, inline
cryptd_shash_desc() into its only caller, allowing it to be removed too.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index cd38f4676176756fc8f0a6f435e4871f86b84ee0..aba9fe0f23b4ad8389ad81ff50f1ad55c000cf69 100644 (file)
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -646,7 +646,8 @@ static int cryptd_hash_import(struct ahash_request *req, const void *in)
 {
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(req);
        struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm);
-       struct shash_desc *desc = cryptd_shash_desc(req);
+       struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
+       struct shash_desc *desc = &rctx->desc;
 
        desc->tfm = ctx->child;
 
@@ -952,115 +953,6 @@ static struct crypto_template cryptd_tmpl = {
        .module = THIS_MODULE,
 };
 
-struct cryptd_skcipher *cryptd_alloc_skcipher(const char *alg_name,
-                                             u32 type, u32 mask)
-{
-       char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];
-       struct cryptd_skcipher_ctx *ctx;
-       struct crypto_skcipher *tfm;
-
-       if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,
-                    "cryptd(%s)", alg_name) >= CRYPTO_MAX_ALG_NAME)
-               return ERR_PTR(-EINVAL);
-
-       tfm = crypto_alloc_skcipher(cryptd_alg_name, type, mask);
-       if (IS_ERR(tfm))
-               return ERR_CAST(tfm);
-
-       if (tfm->base.__crt_alg->cra_module != THIS_MODULE) {
-               crypto_free_skcipher(tfm);
-               return ERR_PTR(-EINVAL);
-       }
-
-       ctx = crypto_skcipher_ctx(tfm);
-       refcount_set(&ctx->refcnt, 1);
-
-       return container_of(tfm, struct cryptd_skcipher, base);
-}
-EXPORT_SYMBOL_GPL(cryptd_alloc_skcipher);
-
-struct crypto_skcipher *cryptd_skcipher_child(struct cryptd_skcipher *tfm)
-{
-       struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(&tfm->base);
-
-       return ctx->child;
-}
-EXPORT_SYMBOL_GPL(cryptd_skcipher_child);
-
-bool cryptd_skcipher_queued(struct cryptd_skcipher *tfm)
-{
-       struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(&tfm->base);
-
-       return refcount_read(&ctx->refcnt) - 1;
-}
-EXPORT_SYMBOL_GPL(cryptd_skcipher_queued);
-
-void cryptd_free_skcipher(struct cryptd_skcipher *tfm)
-{
-       struct cryptd_skcipher_ctx *ctx = crypto_skcipher_ctx(&tfm->base);
-
-       if (refcount_dec_and_test(&ctx->refcnt))
-               crypto_free_skcipher(&tfm->base);
-}
-EXPORT_SYMBOL_GPL(cryptd_free_skcipher);
-
-struct cryptd_ahash *cryptd_alloc_ahash(const char *alg_name,
-                                       u32 type, u32 mask)
-{
-       char cryptd_alg_name[CRYPTO_MAX_ALG_NAME];
-       struct cryptd_hash_ctx *ctx;
-       struct crypto_ahash *tfm;
-
-       if (snprintf(cryptd_alg_name, CRYPTO_MAX_ALG_NAME,
-                    "cryptd(%s)", alg_name) >= CRYPTO_MAX_ALG_NAME)
-               return ERR_PTR(-EINVAL);
-       tfm = crypto_alloc_ahash(cryptd_alg_name, type, mask);
-       if (IS_ERR(tfm))
-               return ERR_CAST(tfm);
-       if (tfm->base.__crt_alg->cra_module != THIS_MODULE) {
-               crypto_free_ahash(tfm);
-               return ERR_PTR(-EINVAL);
-       }
-
-       ctx = crypto_ahash_ctx(tfm);
-       refcount_set(&ctx->refcnt, 1);
-
-       return __cryptd_ahash_cast(tfm);
-}
-EXPORT_SYMBOL_GPL(cryptd_alloc_ahash);
-
-struct crypto_shash *cryptd_ahash_child(struct cryptd_ahash *tfm)
-{
-       struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(&tfm->base);
-
-       return ctx->child;
-}
-EXPORT_SYMBOL_GPL(cryptd_ahash_child);
-
-struct shash_desc *cryptd_shash_desc(struct ahash_request *req)
-{
-       struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req);
-       return &rctx->desc;
-}
-EXPORT_SYMBOL_GPL(cryptd_shash_desc);
-
-bool cryptd_ahash_queued(struct cryptd_ahash *tfm)
-{
-       struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(&tfm->base);
-
-       return refcount_read(&ctx->refcnt) - 1;
-}
-EXPORT_SYMBOL_GPL(cryptd_ahash_queued);
-
-void cryptd_free_ahash(struct cryptd_ahash *tfm)
-{
-       struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(&tfm->base);
-
-       if (refcount_dec_and_test(&ctx->refcnt))
-               crypto_free_ahash(&tfm->base);
-}
-EXPORT_SYMBOL_GPL(cryptd_free_ahash);
-
 struct cryptd_aead *cryptd_alloc_aead(const char *alg_name,
                                                  u32 type, u32 mask)
 {

diff --git a/include/crypto/cryptd.h b/include/crypto/cryptd.h
index 796d986e58e118d9f415fb3cd663f91bc6d0a663..29c5878a3609c3297e1a3fa8934ef16bcbcc9d13 100644 (file)
--- a/include/crypto/cryptd.h
+++ b/include/crypto/cryptd.h
@@ -16,39 +16,6 @@
 #include <linux/types.h>
 
 #include <crypto/aead.h>
-#include <crypto/hash.h>
-#include <crypto/skcipher.h>
-
-struct cryptd_skcipher {
-       struct crypto_skcipher base;
-};
-
-/* alg_name should be algorithm to be cryptd-ed */
-struct cryptd_skcipher *cryptd_alloc_skcipher(const char *alg_name,
-                                             u32 type, u32 mask);
-struct crypto_skcipher *cryptd_skcipher_child(struct cryptd_skcipher *tfm);
-/* Must be called without moving CPUs. */
-bool cryptd_skcipher_queued(struct cryptd_skcipher *tfm);
-void cryptd_free_skcipher(struct cryptd_skcipher *tfm);
-
-struct cryptd_ahash {
-       struct crypto_ahash base;
-};
-
-static inline struct cryptd_ahash *__cryptd_ahash_cast(
-       struct crypto_ahash *tfm)
-{
-       return (struct cryptd_ahash *)tfm;
-}
-
-/* alg_name should be algorithm to be cryptd-ed */
-struct cryptd_ahash *cryptd_alloc_ahash(const char *alg_name,
-                                       u32 type, u32 mask);
-struct crypto_shash *cryptd_ahash_child(struct cryptd_ahash *tfm);
-struct shash_desc *cryptd_shash_desc(struct ahash_request *req);
-/* Must be called without moving CPUs. */
-bool cryptd_ahash_queued(struct cryptd_ahash *tfm);
-void cryptd_free_ahash(struct cryptd_ahash *tfm);
 
 struct cryptd_aead {
        struct crypto_aead base;