Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

staging: ccree: fix buf mgr naming convention 



The buffer manager files were using a func naming convention which was
inconsistent (ssi vs. cc) and often too long.

Make the code more readable by switching to a simpler, consistent naming
convention.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 961559f3

drivers/staging/ccree/ssi_buffer_mgr.c

+12 −16
Original line number Diff line number Diff line
@@ -413,10 +413,8 @@ static int cc_map_sg(struct device *dev, struct scatterlist *sg, 
}



static int

ssi_aead_handle_config_buf(struct device *dev,

			   struct aead_req_ctx *areq_ctx,

			   u8 *config_data,

			   struct buffer_array *sg_data,

cc_set_aead_conf_buf(struct device *dev, struct aead_req_ctx *areq_ctx,

		     u8 *config_data, struct buffer_array *sg_data,

		     unsigned int assoclen)

{

	dev_dbg(dev, " handle additional data config set to DLLI\n");
@@ -441,8 +439,7 @@ ssi_aead_handle_config_buf(struct device *dev, 
	return 0;

}



static int ssi_ahash_handle_curr_buf(struct device *dev,

				     struct ahash_req_ctx *areq_ctx,

static int cc_set_hash_buf(struct device *dev, struct ahash_req_ctx *areq_ctx,

			   u8 *curr_buff, u32 curr_buff_cnt,

			   struct buffer_array *sg_data)

{
@@ -1259,9 +1256,8 @@ int cc_map_aead_request(struct cc_drvdata *drvdata, struct aead_request *req) 
		}

		areq_ctx->ccm_iv0_dma_addr = dma_addr;



		if (ssi_aead_handle_config_buf(dev, areq_ctx,

					       areq_ctx->ccm_config, &sg_data,

					       req->assoclen)) {

		if (cc_set_aead_conf_buf(dev, areq_ctx, areq_ctx->ccm_config,

					 &sg_data, req->assoclen)) {

			rc = -ENOMEM;

			goto aead_map_failure;

		}
@@ -1432,8 +1428,8 @@ int cc_map_hash_request_final(struct cc_drvdata *drvdata, void *ctx, 
	/*TODO: copy data in case that buffer is enough for operation */

	/* map the previous buffer */

	if (*curr_buff_cnt) {

		if (ssi_ahash_handle_curr_buf(dev, areq_ctx, curr_buff,

					      *curr_buff_cnt, &sg_data)) {

		if (cc_set_hash_buf(dev, areq_ctx, curr_buff, *curr_buff_cnt,

				    &sg_data)) {

			return -ENOMEM;

		}

	}
@@ -1545,8 +1541,8 @@ int cc_map_hash_request_update(struct cc_drvdata *drvdata, void *ctx, 
	}



	if (*curr_buff_cnt) {

		if (ssi_ahash_handle_curr_buf(dev, areq_ctx, curr_buff,

					      *curr_buff_cnt, &sg_data)) {

		if (cc_set_hash_buf(dev, areq_ctx, curr_buff, *curr_buff_cnt,

				    &sg_data)) {

			return -ENOMEM;

		}

		/* change the buffer index for next operation */