Merge branch 'acpi-processor'

* acpi-processor:
  ACPI / processor: Do not request ACPI cpufreq module directly

3 files changed, 0 insertions, 24 deletions

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 40fc773ab6e0..146ab7e2b81d 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -171,7 +171,6 @@ static int __acpi_processor_start(struct acpi_device *device)
 
 #ifdef CONFIG_CPU_FREQ
         acpi_processor_ppc_has_changed(pr, 0);
-        acpi_processor_load_module(pr);
 #endif
         acpi_processor_get_throttling_info(pr);
 
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c
index 51d7948611da..60a7c28fc167 100644
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
@@ -235,28 +235,6 @@ void acpi_processor_ppc_exit(void)
         acpi_processor_ppc_status &= ~PPC_REGISTERED;
 }
 
-/*
- * Do a quick check if the systems looks like it should use ACPI
- * cpufreq. We look at a _PCT method being available, but don't
- * do a whole lot of sanity checks.
- */
-void acpi_processor_load_module(struct acpi_processor *pr)
-{
-        static int requested;
-        acpi_status status = 0;
-        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
-
-        if (!arch_has_acpi_pdc() || requested)
-                return;
-        status = acpi_evaluate_object(pr->handle, "_PCT", NULL, &buffer);
-        if (!ACPI_FAILURE(status)) {
-                printk(KERN_INFO PREFIX "Requesting acpi_cpufreq\n");
-                request_module_nowait("acpi_cpufreq");
-                requested = 1;
-        }
-        kfree(buffer.pointer);
-}
-
 static int acpi_processor_get_performance_control(struct acpi_processor *pr)
 {
         int result = 0;
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 7816e45f5d5a..6eb1d3cb5104 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -225,7 +225,6 @@ struct acpi_processor_errata {
         } piix4;
 };
 
-extern void acpi_processor_load_module(struct acpi_processor *pr);
 extern int acpi_processor_preregister_performance(struct
                                                   acpi_processor_performance
                                                   __percpu *performance);