summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorIngo Oeser2007-09-19 13:11:41 +0200
committerDavid S. Miller2007-10-11 01:55:44 +0200
commit5aaff0c8f7dd3515c9f1ca57f86463f30779acc7 (patch)
treed48b3bf14d7cf3db57ed09f48aa2b0288852e716 /crypto
parent[CRYPTO] api: Kill crypto_km_types (diff)
downloadkernel-qcow2-linux-5aaff0c8f7dd3515c9f1ca57f86463f30779acc7.tar.gz
kernel-qcow2-linux-5aaff0c8f7dd3515c9f1ca57f86463f30779acc7.tar.xz
kernel-qcow2-linux-5aaff0c8f7dd3515c9f1ca57f86463f30779acc7.zip
[CRYPTO] blkcipher: Use max() in blkcipher_get_spot() to state the intention
Use max in blkcipher_get_spot() instead of open coding it. Signed-off-by: Ingo Oeser <ioe-lkml@rameria.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/blkcipher.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index 5991c53eabac..9c49770837c2 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -65,7 +65,7 @@ static inline void blkcipher_unmap_dst(struct blkcipher_walk *walk)
static inline u8 *blkcipher_get_spot(u8 *start, unsigned int len)
{
u8 *end_page = (u8 *)(((unsigned long)(start + len - 1)) & PAGE_MASK);
- return start > end_page ? start : end_page;
+ return max(start, end_page);
}
static inline unsigned int blkcipher_done_slow(struct crypto_blkcipher *tfm,