On Tuesday, August 13, 2013 04:50:59 PM Zhang Rui wrote:
> On 二, 2013-08-13 at 10:07 +0800, tianyu.lan@xxxxxxxxx wrote:
> > From: Lan Tianyu <tianyu.lan@xxxxxxxxx>
> >
> > 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@xxxxxxxxx>
>
> Acked-by: Zhang Rui <rui.zhang@xxxxxxxxx>
Queued up for 3.12.
Thanks,
Rafael
> > ---
> > drivers/acpi/processor_driver.c | 4 +++-
> > drivers/acpi/processor_thermal.c | 12 ------------
> > 2 files changed, 3 insertions(+), 13 deletions(-)
> >
> > diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
> > index bd11ef9..e534ba6 100644
> > --- a/drivers/acpi/processor_driver.c
> > +++ b/drivers/acpi/processor_driver.c
> > @@ -175,7 +175,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);
> > diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
> > index e8e6527..d1d2e7f 100644
> > --- a/drivers/acpi/processor_thermal.c
> > +++ b/drivers/acpi/processor_thermal.c
> > @@ -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)
> > {
>
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
