tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Thorsten Blum and committed by
Herbert Xu 9c5582db f4211645

+14 -15
+14 -15
drivers/crypto/stm32/stm32-cryp.c
··· 21 21 #include <linux/interrupt.h> 22 22 #include <linux/kernel.h> 23 23 #include <linux/module.h> 24 + #include <linux/minmax.h> 24 25 #include <linux/of.h> 25 26 #include <linux/platform_device.h> 26 27 #include <linux/pm_runtime.h> ··· 1923 1922 u32 block[AES_BLOCK_32]; 1924 1923 1925 1924 readsl(cryp->regs + cryp->caps->dout, block, cryp->hw_blocksize / sizeof(u32)); 1926 - memcpy_to_scatterwalk(&cryp->out_walk, block, min_t(size_t, cryp->hw_blocksize, 1927 - cryp->payload_out)); 1928 - cryp->payload_out -= min_t(size_t, cryp->hw_blocksize, 1929 - cryp->payload_out); 1925 + memcpy_to_scatterwalk(&cryp->out_walk, block, min(cryp->hw_blocksize, 1926 + cryp->payload_out)); 1927 + cryp->payload_out -= min(cryp->hw_blocksize, cryp->payload_out); 1930 1928 } 1931 1929 1932 1930 static void stm32_cryp_irq_write_block(struct stm32_cryp *cryp) 1933 1931 { 1934 1932 u32 block[AES_BLOCK_32] = {0}; 1935 1933 1936 - memcpy_from_scatterwalk(block, &cryp->in_walk, min_t(size_t, cryp->hw_blocksize, 1937 - cryp->payload_in)); 1934 + memcpy_from_scatterwalk(block, &cryp->in_walk, min(cryp->hw_blocksize, 1935 + cryp->payload_in)); 1938 1936 writesl(cryp->regs + cryp->caps->din, block, cryp->hw_blocksize / sizeof(u32)); 1939 - cryp->payload_in -= min_t(size_t, cryp->hw_blocksize, cryp->payload_in); 1937 + cryp->payload_in -= min(cryp->hw_blocksize, cryp->payload_in); 1940 1938 } 1941 1939 1942 1940 static void stm32_cryp_irq_write_gcm_padded_data(struct stm32_cryp *cryp) ··· 1980 1980 */ 1981 1981 readsl(cryp->regs + cryp->caps->dout, block, cryp->hw_blocksize / sizeof(u32)); 1982 1982 1983 - memcpy_to_scatterwalk(&cryp->out_walk, block, min_t(size_t, cryp->hw_blocksize, 1984 - cryp->payload_out)); 1985 - cryp->payload_out -= min_t(size_t, cryp->hw_blocksize, 1986 - cryp->payload_out); 1983 + memcpy_to_scatterwalk(&cryp->out_walk, block, min(cryp->hw_blocksize, 1984 + cryp->payload_out)); 1985 + cryp->payload_out -= min(cryp->hw_blocksize, cryp->payload_out); 1987 1986 1988 1987 /* d) change mode back to AES GCM */ 1989 1988 cfg &= ~CR_ALGO_MASK; ··· 2077 2078 */ 2078 2079 readsl(cryp->regs + cryp->caps->dout, block, cryp->hw_blocksize / sizeof(u32)); 2079 2080 2080 - memcpy_to_scatterwalk(&cryp->out_walk, block, min_t(size_t, cryp->hw_blocksize, 2081 - cryp->payload_out)); 2082 - cryp->payload_out -= min_t(size_t, cryp->hw_blocksize, cryp->payload_out); 2081 + memcpy_to_scatterwalk(&cryp->out_walk, block, min(cryp->hw_blocksize, 2082 + cryp->payload_out)); 2083 + cryp->payload_out -= min(cryp->hw_blocksize, cryp->payload_out); 2083 2084 2084 2085 /* d) Load again CRYP_CSGCMCCMxR */ 2085 2086 for (i = 0; i < ARRAY_SIZE(cstmp2); i++) ··· 2157 2158 u32 block[AES_BLOCK_32] = {0}; 2158 2159 size_t written; 2159 2160 2160 - written = min_t(size_t, AES_BLOCK_SIZE, cryp->header_in); 2161 + written = min(AES_BLOCK_SIZE, cryp->header_in); 2161 2162 2162 2163 memcpy_from_scatterwalk(block, &cryp->in_walk, written); 2163 2164