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

staging: ccree: remove more unnecessary parentheses 



The removal of likely/unlikely unearthed some more
unnecessary parentheses. Remove them for better readability.

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

drivers/staging/ccree/ssi_buffer_mgr.c

+2 −2
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ static int cc_aead_chain_assoc( 
	else

		areq_ctx->assoc_buff_type = SSI_DMA_BUF_MLLI;



	if ((do_chain) || areq_ctx->assoc_buff_type == SSI_DMA_BUF_MLLI) {

	if (do_chain || areq_ctx->assoc_buff_type == SSI_DMA_BUF_MLLI) {

		dev_dbg(dev, "Chain assoc: buff_type=%s nents=%u\n",

			cc_dma_buf_type(areq_ctx->assoc_buff_type),

			areq_ctx->assoc.nents);
@@ -1656,7 +1656,7 @@ void cc_unmap_hash_request(struct device *dev, void *ctx, 
			      areq_ctx->mlli_params.mlli_dma_addr);

	}



	if ((src) && areq_ctx->in_nents) {

	if (src && areq_ctx->in_nents) {

		dev_dbg(dev, "Unmapped sg src: virt=%pK dma=%pad len=0x%X\n",

			sg_virt(src), &sg_dma_address(src), sg_dma_len(src));

		dma_unmap_sg(dev, src,

drivers/staging/ccree/ssi_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id) 


	drvdata->irq = irr;

	/* Completion interrupt - most probable */

	if ((irr & SSI_COMP_IRQ_MASK)) {

	if (irr & SSI_COMP_IRQ_MASK) {

		/* Mask AXI completion interrupt - will be unmasked in

		 * Deferred service handler

		 */
@@ -121,7 +121,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id) 
	}

#ifdef CC_SUPPORT_FIPS

	/* TEE FIPS interrupt */

	if ((irr & SSI_GPR0_IRQ_MASK)) {

	if (irr & SSI_GPR0_IRQ_MASK) {

		/* Mask interrupt - will be unmasked in Deferred service

		 * handler

		 */
@@ -131,7 +131,7 @@ static irqreturn_t cc_isr(int irq, void *dev_id) 
	}

#endif

	/* AXI error interrupt */

	if ((irr & SSI_AXI_ERR_IRQ_MASK)) {

	if (irr & SSI_AXI_ERR_IRQ_MASK) {

		u32 axi_err;



		/* Read the AXI error ID */

drivers/staging/ccree/ssi_request_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static int request_mgr_queues_status_check( 
		return -EBUSY;

	}



	if ((req_mgr_h->q_free_slots >= total_seq_len))

	if (req_mgr_h->q_free_slots >= total_seq_len)

		return 0;



	/* Wait for space in HW queue. Poll constant num of iterations. */