Commit ee70ad83 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: remove GFP_DMA flag from mem allocs



Remove bogus GFP_DMA flag from memory allocations. ccree driver
does not operate over an ISA or similar limited bus.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3ddcf66
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int cc_cipher_init(struct crypto_tfm *tfm)
	ctx_p->drvdata = cc_alg->drvdata;

	/* Allocate key buffer, cache line aligned */
	ctx_p->user.key = kmalloc(max_key_buf_size, GFP_KERNEL | GFP_DMA);
	ctx_p->user.key = kmalloc(max_key_buf_size, GFP_KERNEL);
	if (!ctx_p->user.key)
		return -ENOMEM;

+6 −9
Original line number Diff line number Diff line
@@ -132,29 +132,27 @@ static int cc_map_req(struct device *dev, struct ahash_req_ctx *state,
	struct cc_hw_desc desc;
	int rc = -ENOMEM;

	state->buff0 = kzalloc(CC_MAX_HASH_BLCK_SIZE, GFP_KERNEL | GFP_DMA);
	state->buff0 = kzalloc(CC_MAX_HASH_BLCK_SIZE, GFP_KERNEL);
	if (!state->buff0)
		goto fail0;

	state->buff1 = kzalloc(CC_MAX_HASH_BLCK_SIZE, GFP_KERNEL | GFP_DMA);
	state->buff1 = kzalloc(CC_MAX_HASH_BLCK_SIZE, GFP_KERNEL);
	if (!state->buff1)
		goto fail_buff0;

	state->digest_result_buff = kzalloc(CC_MAX_HASH_DIGEST_SIZE,
					    GFP_KERNEL | GFP_DMA);
					    GFP_KERNEL);
	if (!state->digest_result_buff)
		goto fail_buff1;

	state->digest_buff = kzalloc(ctx->inter_digestsize,
				     GFP_KERNEL | GFP_DMA);
	state->digest_buff = kzalloc(ctx->inter_digestsize, GFP_KERNEL);
	if (!state->digest_buff)
		goto fail_digest_result_buff;

	dev_dbg(dev, "Allocated digest-buffer in context ctx->digest_buff=@%p\n",
		state->digest_buff);
	if (ctx->hw_mode != DRV_CIPHER_XCBC_MAC) {
		state->digest_bytes_len = kzalloc(HASH_LEN_SIZE,
						  GFP_KERNEL | GFP_DMA);
		state->digest_bytes_len = kzalloc(HASH_LEN_SIZE, GFP_KERNEL);
		if (!state->digest_bytes_len)
			goto fail1;

@@ -164,8 +162,7 @@ static int cc_map_req(struct device *dev, struct ahash_req_ctx *state,
		state->digest_bytes_len = NULL;
	}

	state->opad_digest_buff = kzalloc(ctx->inter_digestsize,
					  GFP_KERNEL | GFP_DMA);
	state->opad_digest_buff = kzalloc(ctx->inter_digestsize, GFP_KERNEL);
	if (!state->opad_digest_buff)
		goto fail2;