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

Commit 4ff66c46 authored by Simon Sandström's avatar Simon Sandström Committed by Greg Kroah-Hartman
Browse files

staging: ccree: Fix alignment issues in ssi_buffer_mgr.c 



Fixes checkpatch.pl alignment warnings.

Signed-off-by: default avatarSimon Sandström <simon@nikanor.nu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3151c1df

drivers/staging/ccree/ssi_buffer_mgr.c

+24 −16
Original line number Diff line number Diff line
@@ -783,8 +783,8 @@ static inline int ssi_buffer_mgr_aead_chain_iv( 
		goto chain_iv_exit;

	}



	areq_ctx->gen_ctx.iv_dma_addr = dma_map_single(dev, req->iv,

		hw_iv_size, DMA_BIDIRECTIONAL);

	areq_ctx->gen_ctx.iv_dma_addr = dma_map_single(dev, req->iv, hw_iv_size,

						       DMA_BIDIRECTIONAL);

	if (unlikely(dma_mapping_error(dev, areq_ctx->gen_ctx.iv_dma_addr))) {

		SSI_LOG_ERR("Mapping iv %u B at va=%pK for DMA failed\n",

			    hw_iv_size, req->iv);
@@ -1323,8 +1323,9 @@ int ssi_buffer_mgr_map_aead_request( 
				req->cryptlen :

				(req->cryptlen - authsize);



	areq_ctx->mac_buf_dma_addr = dma_map_single(dev,

		areq_ctx->mac_buf, MAX_MAC_SIZE, DMA_BIDIRECTIONAL);

	areq_ctx->mac_buf_dma_addr = dma_map_single(dev, areq_ctx->mac_buf,

						    MAX_MAC_SIZE,

						    DMA_BIDIRECTIONAL);

	if (unlikely(dma_mapping_error(dev, areq_ctx->mac_buf_dma_addr))) {

		SSI_LOG_ERR("Mapping mac_buf %u B at va=%pK for DMA failed\n",

			    MAX_MAC_SIZE, areq_ctx->mac_buf);
@@ -1335,7 +1336,8 @@ int ssi_buffer_mgr_map_aead_request( 
	if (areq_ctx->ccm_hdr_size != ccm_header_size_null) {

		areq_ctx->ccm_iv0_dma_addr = dma_map_single(dev,

							    (areq_ctx->ccm_config + CCM_CTR_COUNT_0_OFFSET),

			AES_BLOCK_SIZE, DMA_TO_DEVICE);

							    AES_BLOCK_SIZE,

							    DMA_TO_DEVICE);



		if (unlikely(dma_mapping_error(dev, areq_ctx->ccm_iv0_dma_addr))) {

			SSI_LOG_ERR("Mapping mac_buf %u B at va=%pK "
@@ -1356,7 +1358,9 @@ int ssi_buffer_mgr_map_aead_request( 
#if SSI_CC_HAS_AES_GCM

	if (areq_ctx->cipher_mode == DRV_CIPHER_GCTR) {

		areq_ctx->hkey_dma_addr = dma_map_single(dev,

			areq_ctx->hkey, AES_BLOCK_SIZE, DMA_BIDIRECTIONAL);

							 areq_ctx->hkey,

							 AES_BLOCK_SIZE,

							 DMA_BIDIRECTIONAL);

		if (unlikely(dma_mapping_error(dev, areq_ctx->hkey_dma_addr))) {

			SSI_LOG_ERR("Mapping hkey %u B at va=%pK for DMA failed\n",

				    AES_BLOCK_SIZE, areq_ctx->hkey);
@@ -1365,7 +1369,9 @@ int ssi_buffer_mgr_map_aead_request( 
		}



		areq_ctx->gcm_block_len_dma_addr = dma_map_single(dev,

			&areq_ctx->gcm_len_block, AES_BLOCK_SIZE, DMA_TO_DEVICE);

								  &areq_ctx->gcm_len_block,

								  AES_BLOCK_SIZE,

								  DMA_TO_DEVICE);

		if (unlikely(dma_mapping_error(dev, areq_ctx->gcm_block_len_dma_addr))) {

			SSI_LOG_ERR("Mapping gcm_len_block %u B at va=%pK for DMA failed\n",

				    AES_BLOCK_SIZE, &areq_ctx->gcm_len_block);
@@ -1375,7 +1381,8 @@ int ssi_buffer_mgr_map_aead_request( 


		areq_ctx->gcm_iv_inc1_dma_addr = dma_map_single(dev,

								areq_ctx->gcm_iv_inc1,

			AES_BLOCK_SIZE, DMA_TO_DEVICE);

								AES_BLOCK_SIZE,

								DMA_TO_DEVICE);



		if (unlikely(dma_mapping_error(dev, areq_ctx->gcm_iv_inc1_dma_addr))) {

			SSI_LOG_ERR("Mapping gcm_iv_inc1 %u B at va=%pK "
@@ -1388,7 +1395,8 @@ int ssi_buffer_mgr_map_aead_request( 


		areq_ctx->gcm_iv_inc2_dma_addr = dma_map_single(dev,

								areq_ctx->gcm_iv_inc2,

			AES_BLOCK_SIZE, DMA_TO_DEVICE);

								AES_BLOCK_SIZE,

								DMA_TO_DEVICE);



		if (unlikely(dma_mapping_error(dev, areq_ctx->gcm_iv_inc2_dma_addr))) {

			SSI_LOG_ERR("Mapping gcm_iv_inc2 %u B at va=%pK "