From patchwork Mon Jun 20 06:56:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 896162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5K6s0wu018105 for ; Mon, 20 Jun 2011 07:02:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752315Ab1FTG6J (ORCPT ); Mon, 20 Jun 2011 02:58:09 -0400 Received: from mga01.intel.com ([192.55.52.88]:8195 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752576Ab1FTG6J (ORCPT ); Mon, 20 Jun 2011 02:58:09 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 19 Jun 2011 23:58:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,392,1304319600"; d="scan'208";a="18276257" Received: from lantianyu-ws.sh.intel.com (HELO [10.239.35.77]) ([10.239.35.77]) by fmsmga002.fm.intel.com with ESMTP; 19 Jun 2011 23:58:02 -0700 Subject: [PATCH 2/3] ACPI / Battery: Replace acpi_battery_quirks2 with acpi_battery_quirks From: "lan,Tianyu" To: linux acpi , Len Brown Date: Mon, 20 Jun 2011 14:56:43 +0800 Message-ID: <1308553003.18731.29.camel@lantianyu-ws> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 20 Jun 2011 07:02:40 +0000 (UTC) Since the acpi_battery_quirks has been deleted, replace acpi_battery_quirks2 with acpi_battery_quirks to clean the code Signed-off-by: Lan Tianyu --- drivers/acpi/battery.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index d6a3de9..0ae5b08 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -587,7 +587,7 @@ static void sysfs_remove_battery(struct acpi_battery *battery) * * Handle this correctly so that they won't break userspace. */ -static void acpi_battery_quirks2(struct acpi_battery *battery) +static void acpi_battery_quirks(struct acpi_battery *battery) { if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags)) return ; @@ -623,7 +623,7 @@ static int acpi_battery_update(struct acpi_battery *battery) if (!battery->bat.dev) sysfs_add_battery(battery); result = acpi_battery_get_state(battery); - acpi_battery_quirks2(battery); + acpi_battery_quirks(battery); return result; }