From patchwork Mon Mar 10 11:47:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandr Mezin X-Patchwork-Id: 3802481 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C1B9F9F1CD for ; Mon, 10 Mar 2014 11:50:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0719A2024C for ; Mon, 10 Mar 2014 11:50:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3096C20213 for ; Mon, 10 Mar 2014 11:50:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752608AbaCJLuH (ORCPT ); Mon, 10 Mar 2014 07:50:07 -0400 Received: from mail-la0-f51.google.com ([209.85.215.51]:55409 "EHLO mail-la0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753135AbaCJLuG (ORCPT ); Mon, 10 Mar 2014 07:50:06 -0400 Received: by mail-la0-f51.google.com with SMTP id pv20so4500609lab.38 for ; Mon, 10 Mar 2014 04:50:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I0shTfLBVVQPqLQItsJBwkVbNqQVaKV8O0Ttt51Blhg=; b=doJo7G13v8UbEmcT3pNVzkv4N4IFWXZXpczvlcPBQGe3TcKb1JVi1+K1QhIxkAHkgE uTXrCU2azA+V6jPLoSvCUb4Y1hk3BZOHgOzlEfSato1DRQF5U0CvAaE51pa/s5flcCqE 5YRriMZq3Kckxs4t2TjjBpcEdrozO0f4ANxrlkU6+Aq5ZNM+X2k/zJSSoD1d8KxjAxgY JfSckzGY6zgfAnRzhy4dJY9bPO0qV9+DWT7ZqZ0DYXfPHTMLioL4ESrRs2uP6zV2Sk3G HRpMqaiuQ90pwdPs41otFxZCTkjdqD534NzirFz1x5JaKpEZcABibxu0NNV9WB5lhW/8 FJDQ== X-Received: by 10.152.225.70 with SMTP id ri6mr23009831lac.26.1394452205404; Mon, 10 Mar 2014 04:50:05 -0700 (PDT) Received: from localhost.localdomain ([109.194.125.245]) by mx.google.com with ESMTPSA id jl8sm21397626lbc.16.2014.03.10.04.50.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Mar 2014 04:50:04 -0700 (PDT) From: Alexander Mezin To: linux-acpi@vger.kernel.org Cc: Alexander Mezin Subject: [PATCH 3/3] ACPI / AC: recheck adapter status upon battery notifications Date: Mon, 10 Mar 2014 18:47:41 +0700 Message-Id: <1394452061-27777-3-git-send-email-mezin.alexander@gmail.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394452061-27777-1-git-send-email-mezin.alexander@gmail.com> References: <1394452061-27777-1-git-send-email-mezin.alexander@gmail.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On HP Pavilion dv6-6179er there are no notifications when AC adapter is plugged/unplugged. However, when AC status is read (acpi_ac_get_state), and if AC status has changed, AML code triggers the notification. This patch solves the problem by re-reading AC adapter status upon battery notifications. Signed-off-by: Alexander Mezin --- drivers/acpi/ac.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 6f190bc..e3f9862 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -33,6 +33,7 @@ #include #include #include +#include "battery.h" #define PREFIX "ACPI: " @@ -57,6 +58,7 @@ struct acpi_ac { struct power_supply charger; struct platform_device *pdev; unsigned long long state; + struct notifier_block battery_nb; }; #define to_acpi_ac(x) container_of(x, struct acpi_ac, charger) @@ -152,6 +154,18 @@ static void acpi_ac_notify_handler(acpi_handle handle, u32 event, void *data) return; } +static int acpi_ac_battery_notify(struct notifier_block *nb, + unsigned long action, void *data) +{ + struct acpi_ac *ac = container_of(nb, struct acpi_ac, battery_nb); + struct acpi_bus_event *event = (struct acpi_bus_event *)data; + + if (strcmp(event->device_class, ACPI_BATTERY_CLASS) == 0) + acpi_ac_get_state(ac); + + return NOTIFY_OK; +} + static int thinkpad_e530_quirk(const struct dmi_system_id *d) { ac_sleep_before_get_state_ms = 1000; @@ -215,6 +229,8 @@ static int acpi_ac_probe(struct platform_device *pdev) acpi_device_name(adev), acpi_device_bid(adev), ac->state ? "on-line" : "off-line"); + ac->battery_nb.notifier_call = acpi_ac_battery_notify; + register_acpi_notifier(&ac->battery_nb); end: if (result) kfree(ac); @@ -261,6 +277,7 @@ static int acpi_ac_remove(struct platform_device *pdev) ac = platform_get_drvdata(pdev); if (ac->charger.dev) power_supply_unregister(&ac->charger); + unregister_acpi_notifier(&ac->battery_nb); kfree(ac);