2010-08-23 20:26:25

by Matthew Garrett

Subject: [PATCH] ACPI: Don't report current_now if battery reports in mWh

ACPI batteries can report in units of either current or energy. Right
now we expose the current_now file even if the battery is reporting
energy units, resulting in a file that should contain mA instead
containing mW. Don't expose this value unless the battery is reporting
current.

Signed-off-by: Matthew Garrett <[email protected]>
Cc: Arjan van de Ven <[email protected]>
---
drivers/acpi/battery.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index dc58402..9841720 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -273,7 +273,6 @@ static enum power_supply_property energy_battery_props[] = {
POWER_SUPPLY_PROP_CYCLE_COUNT,
POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
POWER_SUPPLY_PROP_VOLTAGE_NOW,
- POWER_SUPPLY_PROP_CURRENT_NOW,
POWER_SUPPLY_PROP_POWER_NOW,
POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
POWER_SUPPLY_PROP_ENERGY_FULL,
--
1.7.2.1

2010-08-23 21:39:03

by Rafael J. Wysocki

Subject: Re: [PATCH] ACPI: Don't report current_now if battery reports in mWh

On Monday, August 23, 2010, Matthew Garrett wrote:
> ACPI batteries can report in units of either current or energy. Right
> now we expose the current_now file even if the battery is reporting
> energy units, resulting in a file that should contain mA instead
> containing mW. Don't expose this value unless the battery is reporting
> current.
>
> Signed-off-by: Matthew Garrett <[email protected]>
> Cc: Arjan van de Ven <[email protected]>

Acked-by: Rafael J. Wysocki <[email protected]>

> ---
> drivers/acpi/battery.c | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index dc58402..9841720 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -273,7 +273,6 @@ static enum power_supply_property energy_battery_props[] = {
> POWER_SUPPLY_PROP_CYCLE_COUNT,
> POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
> POWER_SUPPLY_PROP_VOLTAGE_NOW,
> - POWER_SUPPLY_PROP_CURRENT_NOW,
> POWER_SUPPLY_PROP_POWER_NOW,
> POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
> POWER_SUPPLY_PROP_ENERGY_FULL,
>

2010-08-24 08:18:31

by Anton Vorontsov

Subject: Re: [PATCH] ACPI: Don't report current_now if battery reports in mWh

On Mon, Aug 23, 2010 at 11:37:19PM +0200, Rafael J. Wysocki wrote:
> On Monday, August 23, 2010, Matthew Garrett wrote:
> > ACPI batteries can report in units of either current or energy. Right
> > now we expose the current_now file even if the battery is reporting
> > energy units, resulting in a file that should contain mA instead
> > containing mW. Don't expose this value unless the battery is reporting
> > current.
> >
> > Signed-off-by: Matthew Garrett <[email protected]>
> > Cc: Arjan van de Ven <[email protected]>
>
> Acked-by: Rafael J. Wysocki <[email protected]>

Looks good to me as well.

Should I merge this into the battery-2.6.git tree, or
ACPI folks are gonna handle this patch?

Thanks,

> > ---
> > drivers/acpi/battery.c | 1 -
> > 1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> > index dc58402..9841720 100644
> > --- a/drivers/acpi/battery.c
> > +++ b/drivers/acpi/battery.c
> > @@ -273,7 +273,6 @@ static enum power_supply_property energy_battery_props[] = {
> > POWER_SUPPLY_PROP_CYCLE_COUNT,
> > POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
> > POWER_SUPPLY_PROP_VOLTAGE_NOW,
> > - POWER_SUPPLY_PROP_CURRENT_NOW,
> > POWER_SUPPLY_PROP_POWER_NOW,
> > POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
> > POWER_SUPPLY_PROP_ENERGY_FULL,
> >

--
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2

2010-08-24 08:44:00

by Zhang, Rui

Subject: Re: [PATCH] ACPI: Don't report current_now if battery reports in mWh

On Tue, 2010-08-24 at 16:18 +0800, Anton Vorontsov wrote:
> On Mon, Aug 23, 2010 at 11:37:19PM +0200, Rafael J. Wysocki wrote:
> > On Monday, August 23, 2010, Matthew Garrett wrote:
> > > ACPI batteries can report in units of either current or energy. Right
> > > now we expose the current_now file even if the battery is reporting
> > > energy units, resulting in a file that should contain mA instead
> > > containing mW. Don't expose this value unless the battery is reporting
> > > current.
> > >
> > > Signed-off-by: Matthew Garrett <[email protected]>
> > > Cc: Arjan van de Ven <[email protected]>
> >
> > Acked-by: Rafael J. Wysocki <[email protected]>
>
> Looks good to me as well.
>
> Should I merge this into the battery-2.6.git tree, or
> ACPI folks are gonna handle this patch?
>
Acked-by: Zhang Rui <[email protected]>

I think Len may want to handle this patch. :)

thanks,
rui

> Thanks,
>
> > > ---
> > > drivers/acpi/battery.c | 1 -
> > > 1 files changed, 0 insertions(+), 1 deletions(-)
> > >
> > > diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> > > index dc58402..9841720 100644
> > > --- a/drivers/acpi/battery.c
> > > +++ b/drivers/acpi/battery.c
> > > @@ -273,7 +273,6 @@ static enum power_supply_property energy_battery_props[] = {
> > > POWER_SUPPLY_PROP_CYCLE_COUNT,
> > > POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
> > > POWER_SUPPLY_PROP_VOLTAGE_NOW,
> > > - POWER_SUPPLY_PROP_CURRENT_NOW,
> > > POWER_SUPPLY_PROP_POWER_NOW,
> > > POWER_SUPPLY_PROP_ENERGY_FULL_DESIGN,
> > > POWER_SUPPLY_PROP_ENERGY_FULL,
> > >
>