crypto: chelsio - stop using crypto_ahash::init

The function pointer crypto_ahash::init is an internal implementation
detail of the ahash API that exists to help it support both ahash and
shash algorithms.  With an upcoming refactoring of how the ahash API
supports shash algorithms, this field will be removed.

Some drivers are invoking crypto_ahash::init to call into their own
code, which is unnecessary and inefficient.  The chelsio driver is one
of those drivers.  Make it just call its own code directly.

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

diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c
index 16298ae4a00bfa41ae7eb18a043dde7ce6317d03..177428480c7d16424e5f05dbc5b2553fa1e31803 100644 (file)
--- a/drivers/crypto/chelsio/chcr_algo.c
+++ b/drivers/crypto/chelsio/chcr_algo.c
@@ -1920,6 +1920,9 @@ err:
        return error;
 }
 
+static int chcr_hmac_init(struct ahash_request *areq);
+static int chcr_sha_init(struct ahash_request *areq);
+
 static int chcr_ahash_digest(struct ahash_request *req)
 {
        struct chcr_ahash_req_ctx *req_ctx = ahash_request_ctx(req);
@@ -1938,7 +1941,11 @@ static int chcr_ahash_digest(struct ahash_request *req)
        req_ctx->rxqidx = cpu % ctx->nrxq;
        put_cpu();
 
-       rtfm->init(req);
+       if (is_hmac(crypto_ahash_tfm(rtfm)))
+               chcr_hmac_init(req);
+       else
+               chcr_sha_init(req);
+
        bs = crypto_tfm_alg_blocksize(crypto_ahash_tfm(rtfm));
        error = chcr_inc_wrcount(dev);
        if (error)