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

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

staging: ccree: Fix alignment issues in ssi_request_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 9ac8a459

drivers/staging/ccree/ssi_request_mgr.c

+20 −22
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ static inline void enqueue_seq( 
		writel_relaxed(seq[i].word[5], (volatile void __iomem *)(cc_base + CC_REG_OFFSET(CRY_KERNEL, DSCRPTR_QUEUE_WORD0)));

#ifdef DX_DUMP_DESCS

		SSI_LOG_DEBUG("desc[%02d]: 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X 0x%08X\n", i,

			seq[i].word[0], seq[i].word[1], seq[i].word[2], seq[i].word[3], seq[i].word[4], seq[i].word[5]);

			      seq[i].word[0], seq[i].word[1], seq[i].word[2],

			      seq[i].word[3], seq[i].word[4], seq[i].word[5]);

#endif

	}

}
@@ -219,8 +220,7 @@ static inline int request_mgr_queues_status_check( 
	/* Wait for space in HW queue. Poll constant num of iterations. */

	for (poll_queue = 0; poll_queue < SSI_MAX_POLL_ITER ; poll_queue++) {

		req_mgr_h->q_free_slots =

			CC_HAL_READ_REGISTER(

				CC_REG_OFFSET(CRY_KERNEL,

			CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL,

							   DSCRPTR_QUEUE_CONTENT));

		if (unlikely(req_mgr_h->q_free_slots <

						req_mgr_h->min_free_hw_slots)) {
@@ -289,8 +289,7 @@ int send_request( 
		 * in case iv gen add the max size and in case of no dout add 1

		 * for the internal completion descriptor

		 */

		rc = request_mgr_queues_status_check(req_mgr_h,

					       cc_base,

		rc = request_mgr_queues_status_check(req_mgr_h, cc_base,

						     max_required_seq_len);

		if (likely(rc == 0))

			/* There is enough place in the queue */
@@ -331,7 +330,8 @@ int send_request( 
			      ssi_req->ivgen_size);



		/* Acquire IV from pool */

		rc = ssi_ivgen_getiv(drvdata, ssi_req->ivgen_dma_addr, ssi_req->ivgen_dma_addr_len,

		rc = ssi_ivgen_getiv(drvdata, ssi_req->ivgen_dma_addr,

				     ssi_req->ivgen_dma_addr_len,

				     ssi_req->ivgen_size, iv_seq, &iv_seq_len);



		if (unlikely(rc != 0)) {
@@ -416,8 +416,7 @@ int send_request_init( 
	enqueue_seq(cc_base, desc, len);



	/* Update the free slots in HW queue */

	req_mgr_h->q_free_slots = CC_HAL_READ_REGISTER(

					CC_REG_OFFSET(CRY_KERNEL,

	req_mgr_h->q_free_slots = CC_HAL_READ_REGISTER(CC_REG_OFFSET(CRY_KERNEL,

								     DSCRPTR_QUEUE_CONTENT));



	return 0;
@@ -543,8 +542,7 @@ static void comp_handler(unsigned long devarg) 
	}

	/* after verifing that there is nothing to do, Unmask AXI completion interrupt */

	CC_HAL_WRITE_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR),

		CC_HAL_READ_REGISTER(

		CC_REG_OFFSET(HOST_RGF, HOST_IMR)) & ~irq);

			      CC_HAL_READ_REGISTER(CC_REG_OFFSET(HOST_RGF, HOST_IMR)) & ~irq);

}



/*