Re: [PATCH] ACPI: Don't report current_now if battery reports inmWh

From: Anton Vorontsov
Date: Tue Aug 24 2010 - 04:18:41 EST


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 <mjg@xxxxxxxxxx>
> > Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
>
> Acked-by: Rafael J. Wysocki <rjw@xxxxxxx>

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: cbouatmailru@xxxxxxxxx
irc://irc.freenode.net/bd2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/