[CRYPTO] ablkcipher: Remove queue pointer from common alg object

Since not everyone needs a queue pointer and those who need it can
always get it from the context anyway the queue pointer in the
common alg object is redundant.

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

2 files changed, 3 insertions, 8 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index 47438b650c92..2731acb86e7d 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -94,10 +94,6 @@ static void crypto_ablkcipher_show(struct seq_file *m, struct crypto_alg *alg)
         seq_printf(m, "min keysize  : %u\n", ablkcipher->min_keysize);
         seq_printf(m, "max keysize  : %u\n", ablkcipher->max_keysize);
         seq_printf(m, "ivsize       : %u\n", ablkcipher->ivsize);
-        if (ablkcipher->queue) {
-                seq_printf(m, "qlen         : %u\n", ablkcipher->queue->qlen);
-                seq_printf(m, "max qlen     : %u\n", ablkcipher->queue->max_qlen);
-        }
 }
 
 const struct crypto_type crypto_ablkcipher_type = {
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index ac6dce2e7596..8bf2da835f7b 100644
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -131,7 +131,7 @@ static int cryptd_blkcipher_enqueue(struct ablkcipher_request *req,
         req->base.complete = complete;
 
         spin_lock_bh(&state->lock);
-        err = ablkcipher_enqueue_request(crypto_ablkcipher_alg(tfm), req);
+        err = ablkcipher_enqueue_request(&state->queue, req);
         spin_unlock_bh(&state->lock);
 
         wake_up_process(state->task);
@@ -173,7 +173,8 @@ static void cryptd_blkcipher_exit_tfm(struct crypto_tfm *tfm)
         int active;
 
         mutex_lock(&state->mutex);
-        active = ablkcipher_tfm_in_queue(__crypto_ablkcipher_cast(tfm));
+        active = ablkcipher_tfm_in_queue(&state->queue,
+                                         __crypto_ablkcipher_cast(tfm));
         mutex_unlock(&state->mutex);
 
         BUG_ON(active);
@@ -251,8 +252,6 @@ static struct crypto_instance *cryptd_alloc_blkcipher(
         inst->alg.cra_ablkcipher.encrypt = cryptd_blkcipher_encrypt_enqueue;
         inst->alg.cra_ablkcipher.decrypt = cryptd_blkcipher_decrypt_enqueue;
 
-        inst->alg.cra_ablkcipher.queue = &state->queue;
-
 out_put_alg:
         crypto_mod_put(alg);
         return inst;