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

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

staging: ccree: Fix alignment issues in ssi_cipher.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 5dff9f5e

drivers/staging/ccree/ssi_cipher.c

+34 −41
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ static int validate_keys_sizes(struct ssi_ablkcipher_ctx *ctx_p, u32 size) 
			break;

		}

	case S_DIN_to_DES:

		if (likely(size == DES3_EDE_KEY_SIZE ||

		    size == DES_KEY_SIZE))

		if (likely(size == DES3_EDE_KEY_SIZE || size == DES_KEY_SIZE))

			return 0;

		break;

#if SSI_CC_HAS_MULTI2
@@ -185,8 +184,8 @@ static int ssi_blkcipher_init(struct crypto_tfm *tfm) 
	int rc = 0;

	unsigned int max_key_buf_size = get_max_keysize(tfm);



	SSI_LOG_DEBUG("Initializing context @%p for %s\n", ctx_p,

						crypto_tfm_alg_name(tfm));

	SSI_LOG_DEBUG("Initializing context @%p for %s\n",

		      ctx_p, crypto_tfm_alg_name(tfm));



	ctx_p->cipher_mode = ssi_alg->cipher_mode;

	ctx_p->flow_mode = ssi_alg->flow_mode;
@@ -621,11 +620,9 @@ ssi_blkcipher_create_data_desc( 
	/* Process */

	if (likely(req_ctx->dma_buf_type == SSI_DMA_BUF_DLLI)) {

		SSI_LOG_DEBUG(" data params addr 0x%llX length 0x%X \n",

			     (unsigned long long)sg_dma_address(src),

			     nbytes);

			      (unsigned long long)sg_dma_address(src), nbytes);

		SSI_LOG_DEBUG(" data params addr 0x%llX length 0x%X \n",

			     (unsigned long long)sg_dma_address(dst),

			     nbytes);

			      (unsigned long long)sg_dma_address(dst), nbytes);

		hw_desc_init(&desc[*seq_size]);

		set_din_type(&desc[*seq_size], DMA_DLLI, sg_dma_address(src),

			     nbytes, NS_BIT);
@@ -786,11 +783,7 @@ static int ssi_blkcipher_process( 
		ssi_blkcipher_create_setup_desc(tfm, req_ctx, ivsize, nbytes,

						desc, &seq_len);

	/* Data processing */

	ssi_blkcipher_create_data_desc(tfm,

			      req_ctx,

			      dst, src,

			      nbytes,

			      areq,

	ssi_blkcipher_create_data_desc(tfm, req_ctx, dst, src, nbytes, areq,

				       desc, &seq_len);



	/* do we need to generate IV? */