acpi : remove power from acpi_processor_cx structure

Message ID 1343164349-28550-1-git-send-email-daniel.lezcano@linaro.org
State Accepted
Commit c59687f8466df36633d937cc298aad465d704990
Headers show

Commit Message

Daniel Lezcano July 24, 2012, 9:12 p.m.
Remove the power field as it is not used.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
 drivers/acpi/processor_idle.c    |    2 --
 drivers/xen/xen-acpi-processor.c |    1 -
 include/acpi/processor.h         |    1 -
 3 files changed, 0 insertions(+), 4 deletions(-)

Comments

Konrad Rzeszutek Wilk July 24, 2012, 9:06 p.m. | #1
On Tue, Jul 24, 2012 at 11:12:29PM +0200, Daniel Lezcano wrote:
> Remove the power field as it is not used.
> 
> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

Acked.

> ---
>  drivers/acpi/processor_idle.c    |    2 --
>  drivers/xen/xen-acpi-processor.c |    1 -
>  include/acpi/processor.h         |    1 -
>  3 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
> index e589c19..90582fb 100644
> --- a/drivers/acpi/processor_idle.c
> +++ b/drivers/acpi/processor_idle.c
> @@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
>  		if (obj->type != ACPI_TYPE_INTEGER)
>  			continue;
>  
> -		cx.power = obj->integer.value;
> -
>  		current_count++;
>  		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
>  
> diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
> index 7ff2569..7ef9c1d 100644
> --- a/drivers/xen/xen-acpi-processor.c
> +++ b/drivers/xen/xen-acpi-processor.c
> @@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
>  
>  		dst_cx->type = cx->type;
>  		dst_cx->latency = cx->latency;
> -		dst_cx->power = cx->power;
>  
>  		dst_cx->dpcnt = 0;
>  		set_xen_guest_handle(dst_cx->dp, NULL);
> diff --git a/include/acpi/processor.h b/include/acpi/processor.h
> index 64ec644..db427fa 100644
> --- a/include/acpi/processor.h
> +++ b/include/acpi/processor.h
> @@ -59,7 +59,6 @@ struct acpi_processor_cx {
>  	u8 entry_method;
>  	u8 index;
>  	u32 latency;
> -	u32 power;
>  	u8 bm_sts_skip;
>  	char desc[ACPI_CX_DESC_LEN];
>  };
> -- 
> 1.7.5.4
Daniel Lezcano Aug. 31, 2012, 6:53 p.m. | #2
On 07/24/2012 11:06 PM, Konrad Rzeszutek Wilk wrote:
> On Tue, Jul 24, 2012 at 11:12:29PM +0200, Daniel Lezcano wrote:
>> Remove the power field as it is not used.
>>
>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Acked.

Hi Rafael,

I did not see this patch going in. Is it possible to merge it ?

Thanks in advance
-- Daniel

>> ---
>>  drivers/acpi/processor_idle.c    |    2 --
>>  drivers/xen/xen-acpi-processor.c |    1 -
>>  include/acpi/processor.h         |    1 -
>>  3 files changed, 0 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
>> index e589c19..90582fb 100644
>> --- a/drivers/acpi/processor_idle.c
>> +++ b/drivers/acpi/processor_idle.c
>> @@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
>>  		if (obj->type != ACPI_TYPE_INTEGER)
>>  			continue;
>>  
>> -		cx.power = obj->integer.value;
>> -
>>  		current_count++;
>>  		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
>>  
>> diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
>> index 7ff2569..7ef9c1d 100644
>> --- a/drivers/xen/xen-acpi-processor.c
>> +++ b/drivers/xen/xen-acpi-processor.c
>> @@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
>>  
>>  		dst_cx->type = cx->type;
>>  		dst_cx->latency = cx->latency;
>> -		dst_cx->power = cx->power;
>>  
>>  		dst_cx->dpcnt = 0;
>>  		set_xen_guest_handle(dst_cx->dp, NULL);
>> diff --git a/include/acpi/processor.h b/include/acpi/processor.h
>> index 64ec644..db427fa 100644
>> --- a/include/acpi/processor.h
>> +++ b/include/acpi/processor.h
>> @@ -59,7 +59,6 @@ struct acpi_processor_cx {
>>  	u8 entry_method;
>>  	u8 index;
>>  	u32 latency;
>> -	u32 power;
>>  	u8 bm_sts_skip;
>>  	char desc[ACPI_CX_DESC_LEN];
>>  };
>> -- 
>> 1.7.5.4
> _______________________________________________
> linaro-dev mailing list
> linaro-dev@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/linaro-dev
>
Rafael J. Wysocki Sept. 1, 2012, 5:54 a.m. | #3
On Friday, August 31, 2012, Daniel Lezcano wrote:
> On 07/24/2012 11:06 PM, Konrad Rzeszutek Wilk wrote:
> > On Tue, Jul 24, 2012 at 11:12:29PM +0200, Daniel Lezcano wrote:
> >> Remove the power field as it is not used.
> >>
> >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> >> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > Acked.
> 
> Hi Rafael,
> 
> I did not see this patch going in. Is it possible to merge it ?

I think so.  I'll take care of it when I get back from LinuxCon/Plumbers Conf.
(early next week).

Thanks,
Rafael


> >> ---
> >>  drivers/acpi/processor_idle.c    |    2 --
> >>  drivers/xen/xen-acpi-processor.c |    1 -
> >>  include/acpi/processor.h         |    1 -
> >>  3 files changed, 0 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
> >> index e589c19..90582fb 100644
> >> --- a/drivers/acpi/processor_idle.c
> >> +++ b/drivers/acpi/processor_idle.c
> >> @@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
> >>  		if (obj->type != ACPI_TYPE_INTEGER)
> >>  			continue;
> >>  
> >> -		cx.power = obj->integer.value;
> >> -
> >>  		current_count++;
> >>  		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
> >>  
> >> diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
> >> index 7ff2569..7ef9c1d 100644
> >> --- a/drivers/xen/xen-acpi-processor.c
> >> +++ b/drivers/xen/xen-acpi-processor.c
> >> @@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
> >>  
> >>  		dst_cx->type = cx->type;
> >>  		dst_cx->latency = cx->latency;
> >> -		dst_cx->power = cx->power;
> >>  
> >>  		dst_cx->dpcnt = 0;
> >>  		set_xen_guest_handle(dst_cx->dp, NULL);
> >> diff --git a/include/acpi/processor.h b/include/acpi/processor.h
> >> index 64ec644..db427fa 100644
> >> --- a/include/acpi/processor.h
> >> +++ b/include/acpi/processor.h
> >> @@ -59,7 +59,6 @@ struct acpi_processor_cx {
> >>  	u8 entry_method;
> >>  	u8 index;
> >>  	u32 latency;
> >> -	u32 power;
> >>  	u8 bm_sts_skip;
> >>  	char desc[ACPI_CX_DESC_LEN];
> >>  };
> > _______________________________________________
> > linaro-dev mailing list
> > linaro-dev@lists.linaro.org
> > http://lists.linaro.org/mailman/listinfo/linaro-dev
> >
> 
> 
>
Rafael J. Wysocki Sept. 5, 2012, 1:41 p.m. | #4
On Saturday, September 01, 2012, Rafael J. Wysocki wrote:
> On Friday, August 31, 2012, Daniel Lezcano wrote:
> > On 07/24/2012 11:06 PM, Konrad Rzeszutek Wilk wrote:
> > > On Tue, Jul 24, 2012 at 11:12:29PM +0200, Daniel Lezcano wrote:
> > >> Remove the power field as it is not used.
> > >>
> > >> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
> > >> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> > > Acked.
> > 
> > Hi Rafael,
> > 
> > I did not see this patch going in. Is it possible to merge it ?
> 
> I think so.  I'll take care of it when I get back from LinuxCon/Plumbers Conf.
> (early next week).

Applied to the linux-next branch of the linux-pm.git tree as v3.7 material.

Are there any other patches you want me to consider for v3.7?

Rafael
Daniel Lezcano Sept. 6, 2012, 7:54 a.m. | #5
On 09/05/2012 03:41 PM, Rafael J. Wysocki wrote:
> On Saturday, September 01, 2012, Rafael J. Wysocki wrote:
>> On Friday, August 31, 2012, Daniel Lezcano wrote:
>>> On 07/24/2012 11:06 PM, Konrad Rzeszutek Wilk wrote:
>>>> On Tue, Jul 24, 2012 at 11:12:29PM +0200, Daniel Lezcano wrote:
>>>>> Remove the power field as it is not used.
>>>>>
>>>>> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
>>>>> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
>>>> Acked.
>>>
>>> Hi Rafael,
>>>
>>> I did not see this patch going in. Is it possible to merge it ?
>>
>> I think so.  I'll take care of it when I get back from LinuxCon/Plumbers Conf.
>> (early next week).
> 
> Applied to the linux-next branch of the linux-pm.git tree as v3.7 material.

Thanks Rafael.

> Are there any other patches you want me to consider for v3.7?

Yes please, I have the per cpu latencies ready to be submitted but I
want to do extra testing before. Unfortunately, the linux-pm-next hangs
at boot time on my intel dual core (not related to the patchset).

I am git bisecting right now.

Thanks
  -- Daniel

Patch

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index e589c19..90582fb 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -483,8 +483,6 @@  static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 		if (obj->type != ACPI_TYPE_INTEGER)
 			continue;
 
-		cx.power = obj->integer.value;
-
 		current_count++;
 		memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
 
diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index 7ff2569..7ef9c1d 100644
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -98,7 +98,6 @@  static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
 
 		dst_cx->type = cx->type;
 		dst_cx->latency = cx->latency;
-		dst_cx->power = cx->power;
 
 		dst_cx->dpcnt = 0;
 		set_xen_guest_handle(dst_cx->dp, NULL);
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 64ec644..db427fa 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -59,7 +59,6 @@  struct acpi_processor_cx {
 	u8 entry_method;
 	u8 index;
 	u32 latency;
-	u32 power;
 	u8 bm_sts_skip;
 	char desc[ACPI_CX_DESC_LEN];
 };