crypto: jitter - Use min() to simplify jent_read_entropy()

Use the min() macro to simplify the jent_read_entropy() function and
improve its readability.

Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/jitterentropy.c b/crypto/jitterentropy.c
index d7056de..3b390bd 100644 (file)
--- a/crypto/jitterentropy.c
+++ b/crypto/jitterentropy.c
@@ -146,6 +146,7 @@ struct rand_data {
 #define JENT_ENTROPY_SAFETY_FACTOR     64
 
 #include <linux/fips.h>
+#include <linux/minmax.h>
 #include "jitterentropy.h"
 
 /***************************************************************************
@@ -638,10 +639,7 @@ int jent_read_entropy(struct rand_data *ec, unsigned char *data,
                        return -2;
                }
 
-               if ((DATA_SIZE_BITS / 8) < len)
-                       tocopy = (DATA_SIZE_BITS / 8);
-               else
-                       tocopy = len;
+               tocopy = min(DATA_SIZE_BITS / 8, len);
                if (jent_read_random_block(ec->hash_state, p, tocopy))
                        return -1;