[PATCH 05/10] crypto: hisilicon/zip - use a enum parameter instead of some macros

[Yang Shen]

Macros 'QPC_COMP', 'QPC_DECOMP' and 'HZIP_CTX_Q_NUM' are relative and
incremental. So, use an enum instead.

Signed-off-by: Yang Shen <shenyan...@huawei.com>
Reviewed-by: Zhou Wang <wangzh...@hisilicon.com>
---
 drivers/crypto/hisilicon/zip/zip_crypto.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/crypto/hisilicon/zip/zip_crypto.c 
b/drivers/crypto/hisilicon/zip/zip_crypto.c
index aba1600..c2ea849 100644
--- a/drivers/crypto/hisilicon/zip/zip_crypto.c
+++ b/drivers/crypto/hisilicon/zip/zip_crypto.c
@@ -19,7 +19,6 @@
 #define GZIP_HEAD_FEXTRA_XLEN                  2
 #define GZIP_HEAD_FHCRC_SIZE                   2

-#define HZIP_CTX_Q_NUM                         2
 #define HZIP_GZIP_HEAD_BUF                     256
 #define HZIP_ALG_PRIORITY                      300
 #define HZIP_SGL_SGE_NR                                10
@@ -32,6 +31,12 @@ enum hisi_zip_alg_type {
        HZIP_ALG_TYPE_DECOMP = 1,
 };

+enum {
+       HZIP_QPC_COMP,
+       HZIP_QPC_DECOMP,
+       HZIP_CTX_Q_NUM
+};
+
 #define COMP_NAME_TO_TYPE(alg_name)                                    \
        (!strcmp((alg_name), "zlib-deflate") ? HZIP_ALG_TYPE_ZLIB :     \
         !strcmp((alg_name), "gzip") ? HZIP_ALG_TYPE_GZIP : 0)          \
@@ -71,8 +76,6 @@ struct hisi_zip_qp_ctx {
 };

 struct hisi_zip_ctx {
-#define QPC_COMP       0
-#define QPC_DECOMP     1
        struct hisi_zip_qp_ctx qp_ctx[HZIP_CTX_Q_NUM];
 };

@@ -264,11 +267,11 @@ static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
        return 0;

 err_free_loop1:
-       kfree(ctx->qp_ctx[QPC_DECOMP].req_q.req_bitmap);
+       kfree(ctx->qp_ctx[HZIP_QPC_DECOMP].req_q.req_bitmap);
 err_free_loop0:
-       kfree(ctx->qp_ctx[QPC_COMP].req_q.q);
+       kfree(ctx->qp_ctx[HZIP_QPC_COMP].req_q.q);
 err_free_bitmap:
-       kfree(ctx->qp_ctx[QPC_COMP].req_q.req_bitmap);
+       kfree(ctx->qp_ctx[HZIP_QPC_COMP].req_q.req_bitmap);
        return ret;
 }

@@ -303,8 +306,8 @@ static int hisi_zip_create_sgl_pool(struct hisi_zip_ctx 
*ctx)
        return 0;

 err_free_sgl_pool0:
-       hisi_acc_free_sgl_pool(&ctx->qp_ctx[QPC_COMP].qp->qm->pdev->dev,
-                              ctx->qp_ctx[QPC_COMP].sgl_pool);
+       hisi_acc_free_sgl_pool(&ctx->qp_ctx[HZIP_QPC_COMP].qp->qm->pdev->dev,
+                              ctx->qp_ctx[HZIP_QPC_COMP].sgl_pool);
        return -ENOMEM;
 }

@@ -539,7 +542,7 @@ static int hisi_zip_do_work(struct hisi_zip_req *req,
 static int hisi_zip_acompress(struct acomp_req *acomp_req)
 {
        struct hisi_zip_ctx *ctx = crypto_tfm_ctx(acomp_req->base.tfm);
-       struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[QPC_COMP];
+       struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[HZIP_QPC_COMP];
        struct hisi_zip_req *req;
        int head_size;
        int ret;
@@ -563,7 +566,7 @@ static int hisi_zip_acompress(struct acomp_req *acomp_req)
 static int hisi_zip_adecompress(struct acomp_req *acomp_req)
 {
        struct hisi_zip_ctx *ctx = crypto_tfm_ctx(acomp_req->base.tfm);
-       struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[QPC_DECOMP];
+       struct hisi_zip_qp_ctx *qp_ctx = &ctx->qp_ctx[HZIP_QPC_DECOMP];
        struct hisi_zip_req *req;
        size_t head_size;
        int ret;
--
2.7.4