ACPI / processor: Remove acpi_processor_get_limit_info()
authorLan Tianyu <tianyu.lan@intel.com>
Tue, 13 Aug 2013 10:11:22 +0000 (12:11 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 13 Aug 2013 10:11:22 +0000 (12:11 +0200)
acpi_processor_get_limit_info() is only called in the __acpi_processor_start()
and what it does actually is just to check pr->flags.throttling and set limit.
The pr pointer has been checked in the __acpi_processor_start() before
acpi_processor_get_limit_info() being called. It doesn't make sense still to
keep it as a function. So move code to __acpi_processor_start() and remove
acpi_processor_get_limit_info().

Signed-off-by: Lan Tianyu <tianyu.lan@intel.com>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/processor_driver.c
drivers/acpi/processor_thermal.c

index 870eaf5..f0a4d0c 100644 (file)
@@ -179,7 +179,9 @@ static int __acpi_processor_start(struct acpi_device *device)
        acpi_processor_load_module(pr);
 #endif
        acpi_processor_get_throttling_info(pr);
-       acpi_processor_get_limit_info(pr);
+
+       if (pr->flags.throttling)
+               pr->flags.limit = 1;
 
        if (!cpuidle_get_driver() || cpuidle_get_driver() == &acpi_idle_driver)
                acpi_processor_power_init(pr);
index e8e6527..d1d2e7f 100644 (file)
@@ -186,18 +186,6 @@ static int cpufreq_set_cur_state(unsigned int cpu, int state)
 
 #endif
 
-int acpi_processor_get_limit_info(struct acpi_processor *pr)
-{
-
-       if (!pr)
-               return -EINVAL;
-
-       if (pr->flags.throttling)
-               pr->flags.limit = 1;
-
-       return 0;
-}
-
 /* thermal coolign device callbacks */
 static int acpi_processor_max_state(struct acpi_processor *pr)
 {