Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753973Ab0HXISb (ORCPT ); Tue, 24 Aug 2010 04:18:31 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:58407 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751683Ab0HXIS1 (ORCPT ); Tue, 24 Aug 2010 04:18:27 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; b=VF19mcCH3mTz95ojbRlSIBD8TSOrsEm2TpuElGtwwz5uvPU3APbobpXiLnTSZCTPJu 6RQS+P8AvEwfRBzuTNYYkhudp5KDWjVkVazOoXgNtFix5FxhLwRC3Hn1q8IuXyGndXhA ejiaRvlhmDDhd0bt6xeakKyRa33NjwemDnGKY= Date: Tue, 24 Aug 2010 12:18:22 +0400 From: Anton Vorontsov To: "Rafael J. Wysocki" Cc: Matthew Garrett , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, dwmw2@infradead.org, lenb@kernel.org, Arjan van de Ven , Zhang Rui , Alexey Starikovskiy Subject: Re: [PATCH] ACPI: Don't report current_now if battery reports in mWh Message-ID: <20100824081822.GA7963@oksana.dev.rtsoft.ru> References: <1282595132-5026-1-git-send-email-mjg@redhat.com> <201008232337.19715.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <201008232337.19715.rjw@sisk.pl> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1661 Lines: 47 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 > > Cc: Arjan van de Ven > > Acked-by: Rafael J. Wysocki 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@gmail.com irc://irc.freenode.net/bd2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/