Commit 9c5582db authored by Thorsten Blum's avatar Thorsten Blum Committed by Herbert Xu
Browse files

crypto: stm32 - Replace min_t(size_t) with just min() 



In most cases, min_t(size_t) and explicit casting are unnecessary
because the values ->hw_blocksize, ->payload_{in,out}, and ->header_in
are already of type 'size_t'. Use the simpler min() macro instead.

Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent f4211645

drivers/crypto/stm32/stm32-cryp.c

+14 −15
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/interrupt.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/minmax.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>
@@ -1922,20 +1923,19 @@ static void stm32_cryp_irq_read_data(struct stm32_cryp *cryp) 
	u32 block[AES_BLOCK_32];



	readsl(cryp->regs + cryp->caps->dout, block, cryp->hw_blocksize / sizeof(u32));

	memcpy_to_scatterwalk(&cryp->out_walk, block, min_t(size_t, cryp->hw_blocksize,

	memcpy_to_scatterwalk(&cryp->out_walk, block, min(cryp->hw_blocksize,

							  cryp->payload_out));

	cryp->payload_out -= min_t(size_t, cryp->hw_blocksize,

				   cryp->payload_out);

	cryp->payload_out -= min(cryp->hw_blocksize, cryp->payload_out);

}



static void stm32_cryp_irq_write_block(struct stm32_cryp *cryp)

{

	u32 block[AES_BLOCK_32] = {0};



	memcpy_from_scatterwalk(block, &cryp->in_walk, min_t(size_t, cryp->hw_blocksize,

	memcpy_from_scatterwalk(block, &cryp->in_walk, min(cryp->hw_blocksize,

							   cryp->payload_in));

	writesl(cryp->regs + cryp->caps->din, block, cryp->hw_blocksize / sizeof(u32));

	cryp->payload_in -= min_t(size_t, cryp->hw_blocksize, cryp->payload_in);

	cryp->payload_in -= min(cryp->hw_blocksize, cryp->payload_in);

}



static void stm32_cryp_irq_write_gcm_padded_data(struct stm32_cryp *cryp)
@@ -1980,10 +1980,9 @@ static void stm32_cryp_irq_write_gcm_padded_data(struct stm32_cryp *cryp) 
	 */

	readsl(cryp->regs + cryp->caps->dout, block, cryp->hw_blocksize / sizeof(u32));



	memcpy_to_scatterwalk(&cryp->out_walk, block, min_t(size_t, cryp->hw_blocksize,

	memcpy_to_scatterwalk(&cryp->out_walk, block, min(cryp->hw_blocksize,

							  cryp->payload_out));

	cryp->payload_out -= min_t(size_t, cryp->hw_blocksize,

				   cryp->payload_out);

	cryp->payload_out -= min(cryp->hw_blocksize, cryp->payload_out);



	/* d) change mode back to AES GCM */

	cfg &= ~CR_ALGO_MASK;
@@ -2078,9 +2077,9 @@ static void stm32_cryp_irq_write_ccm_padded_data(struct stm32_cryp *cryp) 
	 */

	readsl(cryp->regs + cryp->caps->dout, block, cryp->hw_blocksize / sizeof(u32));



	memcpy_to_scatterwalk(&cryp->out_walk, block, min_t(size_t, cryp->hw_blocksize,

	memcpy_to_scatterwalk(&cryp->out_walk, block, min(cryp->hw_blocksize,

							  cryp->payload_out));

	cryp->payload_out -= min_t(size_t, cryp->hw_blocksize, cryp->payload_out);

	cryp->payload_out -= min(cryp->hw_blocksize, cryp->payload_out);



	/* d) Load again CRYP_CSGCMCCMxR */

	for (i = 0; i < ARRAY_SIZE(cstmp2); i++)
@@ -2158,7 +2157,7 @@ static void stm32_cryp_irq_write_gcmccm_header(struct stm32_cryp *cryp) 
	u32 block[AES_BLOCK_32] = {0};

	size_t written;



	written = min_t(size_t, AES_BLOCK_SIZE, cryp->header_in);

	written = min(AES_BLOCK_SIZE, cryp->header_in);



	memcpy_from_scatterwalk(block, &cryp->in_walk, written);