Merge branch 'master' into for-2.6.34

1 files changed, 0 insertions, 6 deletions

diff --git a/arch/x86/kernel/microcode_core.c b/arch/x86/kernel/microcode_core.c
index 0c863243309..cceb5bc3c3c 100644
--- a/arch/x86/kernel/microcode_core.c
+++ b/arch/x86/kernel/microcode_core.c
@@ -521,9 +521,6 @@ static int __init microcode_init(void)
                 return PTR_ERR(microcode_pdev);
         }
 
-        if (microcode_ops->init)
-                microcode_ops->init(&microcode_pdev->dev);
-
         get_online_cpus();
         mutex_lock(&microcode_mutex);
 
@@ -566,9 +563,6 @@ static void __exit microcode_exit(void)
 
         platform_device_unregister(microcode_pdev);
 
-        if (microcode_ops->fini)
-                microcode_ops->fini();
-
         microcode_ops = NULL;
 
         pr_info("Microcode Update Driver: v" MICROCODE_VERSION " removed.\n");