diff options
Diffstat (limited to 'drivers/acpi/processor_perflib.c')
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 43 | 
1 files changed, 5 insertions, 38 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index 51d7948611d..cfc8aba72f8 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -31,15 +31,12 @@  #include <linux/init.h>  #include <linux/cpufreq.h>  #include <linux/slab.h> - +#include <linux/acpi.h> +#include <acpi/processor.h>  #ifdef CONFIG_X86  #include <asm/cpufeature.h>  #endif -#include <acpi/acpi_bus.h> -#include <acpi/acpi_drivers.h> -#include <acpi/processor.h> -  #define PREFIX "ACPI: "  #define ACPI_PROCESSOR_CLASS		"processor" @@ -159,17 +156,9 @@ static int acpi_processor_get_platform_limit(struct acpi_processor *pr)   */  static void acpi_processor_ppc_ost(acpi_handle handle, int status)  { -	union acpi_object params[2] = { -		{.type = ACPI_TYPE_INTEGER,}, -		{.type = ACPI_TYPE_INTEGER,}, -	}; -	struct acpi_object_list arg_list = {2, params}; - -	if (acpi_has_method(handle, "_OST")) { -		params[0].integer.value = ACPI_PROCESSOR_NOTIFY_PERFORMANCE; -		params[1].integer.value =  status; -		acpi_evaluate_object(handle, "_OST", &arg_list, NULL); -	} +	if (acpi_has_method(handle, "_OST")) +		acpi_evaluate_ost(handle, ACPI_PROCESSOR_NOTIFY_PERFORMANCE, +				  status, NULL);  }  int acpi_processor_ppc_has_changed(struct acpi_processor *pr, int event_flag) @@ -235,28 +224,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;  | 
