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 69e1b025b9a4d645c4bccc97b36c81b19640dfe5..fe538e5287a55b8ba2b231629956e32826ed34a1 100644 (file)
--- a/drivers/crypto/geode-aes.c
+++ b/drivers/crypto/geode-aes.c
@@ -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,
@@ -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,
@@ -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;
 }