From patchwork Fri Sep 12 11:11:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonghwa Lee X-Patchwork-Id: 4893871 Return-Path: X-Original-To: patchwork-linux-pm@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 CB0709F40F for ; Fri, 12 Sep 2014 11:06:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E73022017A for ; Fri, 12 Sep 2014 11:11:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6C6120279 for ; Fri, 12 Sep 2014 11:11:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754108AbaILLLi (ORCPT ); Fri, 12 Sep 2014 07:11:38 -0400 Received: from mailout3.samsung.com ([203.254.224.33]:31529 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753419AbaILLLh (ORCPT ); Fri, 12 Sep 2014 07:11:37 -0400 Received: from epcpsbgr5.samsung.com (u145.gpu120.samsung.co.kr [203.254.230.145]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NBS00E5WCF9H0C0@mailout3.samsung.com> for linux-pm@vger.kernel.org; Fri, 12 Sep 2014 20:11:33 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.113]) by epcpsbgr5.samsung.com (EPCPMTA) with SMTP id 59.85.04513.5E4D2145; Fri, 12 Sep 2014 20:11:33 +0900 (KST) X-AuditID: cbfee691-f79546d0000011a1-d2-5412d4e5e4ba Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id BB.AF.05196.5E4D2145; Fri, 12 Sep 2014 20:11:33 +0900 (KST) Received: from localhost.localdomain ([10.252.82.199]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NBS00I6JCF58I00@mmp2.samsung.com>; Fri, 12 Sep 2014 20:11:33 +0900 (KST) From: Jonghwa Lee To: linux-pm@vger.kernel.org Cc: dbaryshkov@gmail.com, dwmw2@infradead.org, anton@enomsg.org, cw00.choi@samsung.com, myungjoo.ham@samsung.com, Jonghwa Lee Subject: [PATCH 4/6] power: charger-manager: Use power_supply_changed() not private uevent. Date: Fri, 12 Sep 2014 20:11:25 +0900 Message-id: <1410520287-24825-5-git-send-email-jonghwa3.lee@samsung.com> X-Mailer: git-send-email 1.7.9.5 In-reply-to: <1410520287-24825-1-git-send-email-jonghwa3.lee@samsung.com> References: <1410520287-24825-1-git-send-email-jonghwa3.lee@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsWyRsSkUPfpFaEQgwWX1S0ObtW0uP7lOavF pCfvmS0mrpzMbNF59gmzxefeI4wWtxtXsDmwe0zo/8TosXPWXXaPzSu0PPq2rGL0+LxJLoA1 issmJTUnsyy1SN8ugStj+a4+toILWhUTj3xkbmD8odTFyMkhIWAi8WJNDzOELSZx4d56ti5G Lg4hgaWMEh8mTGeEKXo6uYUJIjGdUeJ/9wIop41J4vOr/ewgVWwCOhL/990Es0UEZCSmXtnP ClLELDCHUWL37K9gO4QFYiWW9/WygdgsAqoSU9f3soDYvAIeEuu6zgA1cACtU5CYM8kGJMwp 4Cmx+Nw2sJlCQCX7pr9lB5kpITCdXeL0nuPMEHMEJL5NPsQC0SsrsekA1DuSEgdX3GCZwCi8 gJFhFaNoakFyQXFSepGpXnFibnFpXrpecn7uJkZgkJ/+92ziDsb7B6wPMQpwMCrx8FawCIYI sSaWFVfmHmI0BdowkVlKNDkfGEt5JfGGxmZGFqYmpsZG5pZmSuK8OtI/g4UE0hNLUrNTUwtS i+KLSnNSiw8xMnFwSjUwHjrd6J+37Y+u94YC4yBH5c/37/ZXyHSZui9Wb+ao+/ikmNX3m6fY wbDctZ/UO2K23/Np3hd3YB6PVqh89vf2rwGSLiq1KzkXCD5JVP89KWX+E7uT+9fzba64NyFk YcGEozq7nVc5PxW1Ued5cpbRZKvG/bUHmd0VfnLqymfLPJ3vt6ydRTtJiaU4I9FQi7moOBEA jft7C20CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrCIsWRmVeSWpSXmKPExsVy+t9jQd2nV4RCDDo6FSwObtW0uP7lOavF pCfvmS0mrpzMbNF59gmzxefeI4wWtxtXsDmwe0zo/8TosXPWXXaPzSu0PPq2rGL0+LxJLoA1 qoHRJiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwfoCiWF ssScUqBQQGJxsZK+HaYJoSFuuhYwjRG6viFBcD1GBmggYQ1jxvJdfWwFF7QqJh75yNzA+EOp i5GTQ0LAROLp5BYmCFtM4sK99WxdjFwcQgLTGSX+dy9ggnDamCQ+v9rPDlLFJqAj8X/fTTBb REBGYuqV/awgRcwCcxglds/+ygySEBaIlVje18sGYrMIqEpMXd/LAmLzCnhIrOs6A9TAAbRO QWLOJBuQMKeAp8Tic9vAZgoBleyb/pZ9AiPvAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5 mxjBMfRMegfjqgaLQ4wCHIxKPLyVLIIhQqyJZcWVuYcYJTiYlUR4zY8KhQjxpiRWVqUW5ccX leakFh9iNAU6aiKzlGhyPjC+80riDY1NzIwsjcwNLYyMzZXEeQ+2WgcKCaQnlqRmp6YWpBbB 9DFxcEo1ME5sifzNKLQqbdfGo03fyk12ftpUZvVnXs6dZU1O+j+X3Ky9eE38vFbew4PFP/js uDbVfxAOem1Vvp5N/ICI6sozmsFbyo5Id8tmRJhf29PycMvf+Unxm9ldgz1PNuW788Yqn5Tw ChcPl+AQFGhzd0rc7vOE2fEYh4T1rySNyS855q854PqwQYmlOCPRUIu5qDgRAAtN6Gm3AgAA DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-9.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Whenever battery status is changed, charger manager tries to trigger uevent through private interface. This patch modifies it to use power_supply_changed() since it belongs to power supply subsystem. Signed-off-by: Jonghwa Lee --- drivers/power/charger-manager.c | 81 +++------------------------------------ 1 file changed, 6 insertions(+), 75 deletions(-) diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c index a8c73db..1917a26 100644 --- a/drivers/power/charger-manager.c +++ b/drivers/power/charger-manager.c @@ -35,18 +35,6 @@ #define CM_DEFAULT_RECHARGE_TEMP_DIFF 50 #define CM_DEFAULT_CHARGE_TEMP_MAX 500 -static const char * const default_event_names[] = { - [CM_EVENT_UNKNOWN] = "Unknown", - [CM_EVENT_BATT_FULL] = "Battery Full", - [CM_EVENT_BATT_IN] = "Battery Inserted", - [CM_EVENT_BATT_OUT] = "Battery Pulled Out", - [CM_EVENT_BATT_OVERHEAT] = "Battery Overheat", - [CM_EVENT_BATT_COLD] = "Battery Cold", - [CM_EVENT_EXT_PWR_IN_OUT] = "External Power Attach/Detach", - [CM_EVENT_CHG_START_STOP] = "Charging Start/Stop", - [CM_EVENT_OTHERS] = "Other battery events" -}; - /* * Regard CM_JIFFIES_SMALL jiffies is small enough to ignore for * delayed works so that we can run delayed works with CM_JIFFIES_SMALL @@ -63,8 +51,6 @@ static const char * const default_event_names[] = { */ #define CM_RTC_SMALL (2) -#define UEVENT_BUF_SIZE 32 - static LIST_HEAD(cm_list); static DEFINE_MUTEX(cm_list_mtx); @@ -401,61 +387,6 @@ static int try_charger_restart(struct charger_manager *cm) } /** - * uevent_notify - Let users know something has changed. - * @cm: the Charger Manager representing the battery. - * @event: the event string. - * - * If @event is null, it implies that uevent_notify is called - * by resume function. When called in the resume function, cm_suspended - * should be already reset to false in order to let uevent_notify - * notify the recent event during the suspend to users. While - * suspended, uevent_notify does not notify users, but tracks - * events so that uevent_notify can notify users later after resumed. - */ -static void uevent_notify(struct charger_manager *cm, const char *event) -{ - static char env_str[UEVENT_BUF_SIZE + 1] = ""; - static char env_str_save[UEVENT_BUF_SIZE + 1] = ""; - - if (cm_suspended) { - /* Nothing in suspended-event buffer */ - if (env_str_save[0] == 0) { - if (!strncmp(env_str, event, UEVENT_BUF_SIZE)) - return; /* status not changed */ - strncpy(env_str_save, event, UEVENT_BUF_SIZE); - return; - } - - if (!strncmp(env_str_save, event, UEVENT_BUF_SIZE)) - return; /* Duplicated. */ - strncpy(env_str_save, event, UEVENT_BUF_SIZE); - return; - } - - if (event == NULL) { - /* No messages pending */ - if (!env_str_save[0]) - return; - - strncpy(env_str, env_str_save, UEVENT_BUF_SIZE); - kobject_uevent(&cm->dev->kobj, KOBJ_CHANGE); - env_str_save[0] = 0; - - return; - } - - /* status not changed */ - if (!strncmp(env_str, event, UEVENT_BUF_SIZE)) - return; - - /* save the status and notify the update */ - strncpy(env_str, event, UEVENT_BUF_SIZE); - kobject_uevent(&cm->dev->kobj, KOBJ_CHANGE); - - dev_info(cm->dev, "%s\n", event); -} - -/** * fullbatt_vchk - Check voltage drop some times after "FULL" event. * * If a user has designated "fullbatt_vchkdrop_uV" values with @@ -485,7 +416,7 @@ static void fullbatt_vchk(struct charger_manager *cm) if (diff > desc->fullbatt_vchkdrop_uV) { try_charger_restart(cm); - uevent_notify(cm, "Recharging"); + power_supply_changed(&cm->charger_psy); } } @@ -516,7 +447,7 @@ static int check_charging_duration(struct charger_manager *cm) if (duration > desc->charging_max_duration_ms) { dev_info(cm->dev, "Charging duration exceed %ums\n", desc->charging_max_duration_ms); - uevent_notify(cm, "Discharging"); + power_supply_changed(&cm->charger_psy); try_charger_enable(cm, false); ret = true; } @@ -527,7 +458,7 @@ static int check_charging_duration(struct charger_manager *cm) is_ext_pwr_online(cm)) { dev_info(cm->dev, "Discharging duration exceed %ums\n", desc->discharging_max_duration_ms); - uevent_notify(cm, "Recharging"); + power_supply_changed(&cm->charger_psy); try_charger_enable(cm, true); ret = true; } @@ -606,7 +537,7 @@ static bool _cm_monitor(struct charger_manager *cm) if (temp_alrt) { cm->emergency_stop = temp_alrt; if (!try_charger_enable(cm, false)) - uevent_notify(cm, default_event_names[temp_alrt]); + power_supply_changed(&cm->charger_psy); /* * Check whole charging duration and discharing duration @@ -631,7 +562,7 @@ static bool _cm_monitor(struct charger_manager *cm) } else if (!cm->emergency_stop && is_full_charged(cm) && cm->charger_enabled) { dev_info(cm->dev, "EVENT_HANDLE: Battery Fully Charged\n"); - uevent_notify(cm, default_event_names[CM_EVENT_BATT_FULL]); + power_supply_changed(&cm->charger_psy); try_charger_enable(cm, false); @@ -640,7 +571,7 @@ static bool _cm_monitor(struct charger_manager *cm) cm->emergency_stop = 0; if (is_ext_pwr_online(cm)) { if (!try_charger_enable(cm, true)) - uevent_notify(cm, "CHARGING"); + power_supply_changed(&cm->charger_psy); } }