Merge tag 'v3.16-rc4' into drm-intel-next-queued

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / geode-aes.c

diff --git a/drivers/crypto/geode-aes.c b/drivers/crypto/geode-aes.c
index 0c9ff497172425f617bd753c912b7b62567c7e74..fe538e5287a55b8ba2b231629956e32826ed34a1 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);
@@ -255,7 +255,7 @@ geode_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)
 
 static int fallback_init_cip(struct crypto_tfm *tfm)
 {
-       const char *name = tfm->__crt_alg->cra_name;
+       const char *name = crypto_tfm_alg_name(tfm);
        struct geode_aes_op *op = crypto_tfm_ctx(tfm);
 
        op->fallback.cip = crypto_alloc_cipher(name, 0,
@@ -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);
@@ -365,7 +365,7 @@ geode_cbc_encrypt(struct blkcipher_desc *desc,
 
 static int fallback_init_blk(struct crypto_tfm *tfm)
 {
-       const char *name = tfm->__crt_alg->cra_name;
+       const char *name = crypto_tfm_alg_name(tfm);
        struct geode_aes_op *op = crypto_tfm_ctx(tfm);
 
        op->fallback.blk = crypto_alloc_blkcipher(name, 0,
@@ -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,
@@ -408,7 +408,7 @@ static struct crypto_alg geode_cbc_alg = {
                        .setkey                 =       geode_setkey_blk,
                        .encrypt                =       geode_cbc_encrypt,
                        .decrypt                =       geode_cbc_decrypt,
-                       .ivsize                 =       AES_IV_LENGTH,
+                       .ivsize                 =       AES_BLOCK_SIZE,
                }
        }
 };
@@ -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,
@@ -547,7 +547,7 @@ static int geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
        if (ret)
                goto eecb;
 
-       printk(KERN_NOTICE "geode-aes: GEODE AES engine enabled.\n");
+       dev_notice(&dev->dev, "GEODE AES engine enabled.\n");
        return 0;
 
  eecb:
@@ -565,7 +565,7 @@ static int geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
  eenable:
        pci_disable_device(dev);
 
-       printk(KERN_ERR "geode-aes:  GEODE AES initialization failed.\n");
+       dev_err(&dev->dev, "GEODE AES initialization failed.\n");
        return ret;
 }