Skip to content

Commit 11364d6

Browse files
tititiou36herbertx
authored andcommitted
crypto: hisilicon/zip - Use the bitmap API to allocate bitmaps
Use bitmap_zalloc()/bitmap_free() instead of hand-writing them. It is less verbose and it improves the semantic. While at it, add an explicit include <linux/bitmap.h>. Signed-off-by: Christophe JAILLET <[email protected]> Signed-off-by: Herbert Xu <[email protected]>
1 parent 45f5d01 commit 11364d6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

drivers/crypto/hisilicon/zip/zip_crypto.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/* Copyright (c) 2019 HiSilicon Limited. */
33
#include <crypto/internal/acompress.h>
44
#include <linux/bitfield.h>
5+
#include <linux/bitmap.h>
56
#include <linux/dma-mapping.h>
67
#include <linux/scatterlist.h>
78
#include "zip.h"
@@ -606,8 +607,7 @@ static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
606607
req_q = &ctx->qp_ctx[i].req_q;
607608
req_q->size = QM_Q_DEPTH;
608609

609-
req_q->req_bitmap = kcalloc(BITS_TO_LONGS(req_q->size),
610-
sizeof(long), GFP_KERNEL);
610+
req_q->req_bitmap = bitmap_zalloc(req_q->size, GFP_KERNEL);
611611
if (!req_q->req_bitmap) {
612612
ret = -ENOMEM;
613613
if (i == 0)
@@ -631,11 +631,11 @@ static int hisi_zip_create_req_q(struct hisi_zip_ctx *ctx)
631631
return 0;
632632

633633
err_free_loop1:
634-
kfree(ctx->qp_ctx[HZIP_QPC_DECOMP].req_q.req_bitmap);
634+
bitmap_free(ctx->qp_ctx[HZIP_QPC_DECOMP].req_q.req_bitmap);
635635
err_free_loop0:
636636
kfree(ctx->qp_ctx[HZIP_QPC_COMP].req_q.q);
637637
err_free_bitmap:
638-
kfree(ctx->qp_ctx[HZIP_QPC_COMP].req_q.req_bitmap);
638+
bitmap_free(ctx->qp_ctx[HZIP_QPC_COMP].req_q.req_bitmap);
639639
return ret;
640640
}
641641

@@ -645,7 +645,7 @@ static void hisi_zip_release_req_q(struct hisi_zip_ctx *ctx)
645645

646646
for (i = 0; i < HZIP_CTX_Q_NUM; i++) {
647647
kfree(ctx->qp_ctx[i].req_q.q);
648-
kfree(ctx->qp_ctx[i].req_q.req_bitmap);
648+
bitmap_free(ctx->qp_ctx[i].req_q.req_bitmap);
649649
}
650650
}
651651

0 commit comments

Comments
 (0)