Merge branch 'dmaengine' into async-tx-next

Conflicts:
	crypto/async_tx/async_xor.c
	drivers/dma/ioat/dma_v2.h
	drivers/dma/ioat/pci.c
	drivers/md/raid5.c

1 files changed, 1 insertions, 17 deletions

diff --git a/crypto/algboss.c b/crypto/algboss.c
index 6906f92aeac0..9908dd830c26 100644
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -280,29 +280,13 @@ static struct notifier_block cryptomgr_notifier = {
 
 static int __init cryptomgr_init(void)
 {
-        int err;
-
-        err = testmgr_init();
-        if (err)
-                return err;
-
-        err = crypto_register_notifier(&cryptomgr_notifier);
-        if (err)
-                goto free_testmgr;
-
-        return 0;
-
-free_testmgr:
-        testmgr_exit();
-        return err;
+        return crypto_register_notifier(&cryptomgr_notifier);
 }
 
 static void __exit cryptomgr_exit(void)
 {
         int err = crypto_unregister_notifier(&cryptomgr_notifier);
         BUG_ON(err);
-
-        testmgr_exit();
 }
 
 subsys_initcall(cryptomgr_init);