crypto: geode - Kill AES_MIN_BLOCK_SIZE

This is actually defined in include/crypto/aes.h , no need to have
a a different symbol for the same thing twice.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Dmitry Kasatkin <dmitry.kasatkin@nokia.com>
Cc: Eric Bénard <eric@eukrea.com>
Cc: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Cc: Michal Ludvig <michal@logix.cz>
Cc: Varun Wadekar <vwadekar@nvidia.com>
Cc: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: linux-geode@lists.infradead.org
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 0c9ff497172425f617bd753c912b7b62567c7e74..32001d6b76ef1851c18e826e189d1e1ff9829a59 100644 (file)
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -226,7 +226,7 @@ geode_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
        op->dst = (void *) out;
        op->mode = AES_MODE_ECB;
        op->flags = 0;
-       op->len = AES_MIN_BLOCK_SIZE;
+       op->len = AES_BLOCK_SIZE;
        op->dir = AES_DIR_ENCRYPT;
 
        geode_aes_crypt(op);
@@ -247,7 +247,7 @@ geode_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
        op->dst = (void *) out;
        op->mode = AES_MODE_ECB;
        op->flags = 0;
-       op->len = AES_MIN_BLOCK_SIZE;
+       op->len = AES_BLOCK_SIZE;
        op->dir = AES_DIR_DECRYPT;
 
        geode_aes_crypt(op);
@@ -286,7 +286,7 @@ static struct crypto_alg geode_alg = {
                                                        CRYPTO_ALG_NEED_FALLBACK,
        .cra_init                       =       fallback_init_cip,
        .cra_exit                       =       fallback_exit_cip,
-       .cra_blocksize          =       AES_MIN_BLOCK_SIZE,
+       .cra_blocksize          =       AES_BLOCK_SIZE,
        .cra_ctxsize            =       sizeof(struct geode_aes_op),
        .cra_module                     =       THIS_MODULE,
        .cra_u                          =       {
@@ -320,7 +320,7 @@ geode_cbc_decrypt(struct blkcipher_desc *desc,
                op->src = walk.src.virt.addr,
                op->dst = walk.dst.virt.addr;
                op->mode = AES_MODE_CBC;
-               op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+               op->len = nbytes - (nbytes % AES_BLOCK_SIZE);
                op->dir = AES_DIR_DECRYPT;
 
                ret = geode_aes_crypt(op);
@@ -352,7 +352,7 @@ geode_cbc_encrypt(struct blkcipher_desc *desc,
                op->src = walk.src.virt.addr,
                op->dst = walk.dst.virt.addr;
                op->mode = AES_MODE_CBC;
-               op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+               op->len = nbytes - (nbytes % AES_BLOCK_SIZE);
                op->dir = AES_DIR_ENCRYPT;
 
                ret = geode_aes_crypt(op);
@@ -396,7 +396,7 @@ static struct crypto_alg geode_cbc_alg = {
                                                CRYPTO_ALG_NEED_FALLBACK,
        .cra_init                       =       fallback_init_blk,
        .cra_exit                       =       fallback_exit_blk,
-       .cra_blocksize          =       AES_MIN_BLOCK_SIZE,
+       .cra_blocksize          =       AES_BLOCK_SIZE,
        .cra_ctxsize            =       sizeof(struct geode_aes_op),
        .cra_alignmask          =       15,
        .cra_type                       =       &crypto_blkcipher_type,
@@ -432,7 +432,7 @@ geode_ecb_decrypt(struct blkcipher_desc *desc,
                op->src = walk.src.virt.addr,
                op->dst = walk.dst.virt.addr;
                op->mode = AES_MODE_ECB;
-               op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+               op->len = nbytes - (nbytes % AES_BLOCK_SIZE);
                op->dir = AES_DIR_DECRYPT;
 
                ret = geode_aes_crypt(op);
@@ -462,7 +462,7 @@ geode_ecb_encrypt(struct blkcipher_desc *desc,
                op->src = walk.src.virt.addr,
                op->dst = walk.dst.virt.addr;
                op->mode = AES_MODE_ECB;
-               op->len = nbytes - (nbytes % AES_MIN_BLOCK_SIZE);
+               op->len = nbytes - (nbytes % AES_BLOCK_SIZE);
                op->dir = AES_DIR_ENCRYPT;
 
                ret = geode_aes_crypt(op);
@@ -482,7 +482,7 @@ static struct crypto_alg geode_ecb_alg = {
                                                CRYPTO_ALG_NEED_FALLBACK,
        .cra_init                       =       fallback_init_blk,
        .cra_exit                       =       fallback_exit_blk,
-       .cra_blocksize          =       AES_MIN_BLOCK_SIZE,
+       .cra_blocksize          =       AES_BLOCK_SIZE,
        .cra_ctxsize            =       sizeof(struct geode_aes_op),
        .cra_alignmask          =       15,
        .cra_type                       =       &crypto_blkcipher_type,

diff --git a/drivers/crypto/geode-aes.h b/drivers/crypto/geode-aes.h
index f1855b50da48d53cbc3e1f2d6d953529e56252d5..cedf2c5be118c826e8c47aef1c79756874adc582 100644 (file)
--- a/drivers/crypto/geode-aes.h
+++ b/drivers/crypto/geode-aes.h
@@ -12,7 +12,6 @@
 /* driver logic flags */
 #define AES_IV_LENGTH  16
 #define AES_KEY_LENGTH 16
-#define AES_MIN_BLOCK_SIZE 16
 
 #define AES_MODE_ECB 0
 #define AES_MODE_CBC 1