crypto: sun4i-ss - group variable definitions in sun4i_hash()

Cosmetic change to avoid having a full screen a variable definitions. It
also helps to see which variables share the same type.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
index 0de2f62d51ff763e5626739ba260da1f7d8599da..8553253388448dfef1a75ab3ba25566b3ffba8a6 100644 (file)
--- a/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-hash.c
@@ -167,37 +167,28 @@ int sun4i_hash_import_sha1(struct ahash_request *areq, const void *in)
  */
 static int sun4i_hash(struct ahash_request *areq)
 {
-       u32 v, ivmode = 0;
-       unsigned int i = 0;
        /*
         * i is the total bytes read from SGs, to be compared to areq->nbytes
         * i is important because we cannot rely on SG length since the sum of
         * SG->length could be greater than areq->nbytes
+        *
+        * end is the position when we need to stop writing to the device,
+        * to be compared to i
+        *
+        * in_i: advancement in the current SG
         */
-
+       unsigned int i = 0, end, index, padlen, nwait, nbw = 0, j = 0, todo;
+       unsigned int in_i = 0;
+       u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32], wb = 0, v, ivmode = 0;
        struct sun4i_req_ctx *op = ahash_request_ctx(areq);
        struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
        struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
        struct sun4i_ss_ctx *ss = tfmctx->ss;
-       unsigned int in_i = 0; /* advancement in the current SG */
-       unsigned int end;
-       /*
-        * end is the position when we need to stop writing to the device,
-        * to be compared to i
-        */
-       int in_r, err = 0;
-       unsigned int todo;
-       u32 spaces, rx_cnt = SS_RX_DEFAULT;
-       size_t copied = 0;
+       struct scatterlist *in_sg = areq->src;
        struct sg_mapping_iter mi;
-       unsigned int j = 0;
-       int zeros;
-       unsigned int index, padlen;
+       int in_r, err = 0, zeros;
+       size_t copied = 0;
        __be64 bits;
-       u32 bf[32];
-       u32 wb = 0;
-       unsigned int nwait, nbw = 0;
-       struct scatterlist *in_sg = areq->src;
 
        dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x",
                __func__, crypto_tfm_alg_name(areq->base.tfm),