From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Subject: [PATCH 8/8] power_supply: Block suspend while power supply change notifications are pending Date: Thu, 13 May 2010 21:11:13 -0700 Message-ID: <1273810273-3039-9-git-send-email-arve@android.com> References: <1273810273-3039-1-git-send-email-arve@android.com> <1273810273-3039-2-git-send-email-arve@android.com> <1273810273-3039-3-git-send-email-arve@android.com> <1273810273-3039-4-git-send-email-arve@android.com> <1273810273-3039-5-git-send-email-arve@android.com> <1273810273-3039-6-git-send-email-arve@android.com> <1273810273-3039-7-git-send-email-arve@android.com> <1273810273-3039-8-git-send-email-arve@android.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1273810273-3039-8-git-send-email-arve@android.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: Len Brown , Mark Brown , Andres Salomon , Anton Vorontsov , Daniel Mack , David Woodhouse List-Id: linux-pm@vger.kernel.org V2hlbiBjb25uZWN0aW5nIHVzYiBvciB0aGUgY2hhcmdlciB0aGUgZGV2aWNlIHdvdWxkIG9mdGVu IGdvIGJhY2sgdG8gc2xlZXAKYmVmb3JlIHRoZSBjaGFyZ2UgbGVkIGFuZCBzY3JlZW4gdHVybmVk IG9uLgoKU2lnbmVkLW9mZi1ieTogQXJ2ZSBIasO4bm5ldsOlZyA8YXJ2ZUBhbmRyb2lkLmNvbT4K LS0tCiBkcml2ZXJzL3Bvd2VyL3Bvd2VyX3N1cHBseV9jb3JlLmMgfCAgICA5ICsrKysrKy0tLQog aW5jbHVkZS9saW51eC9wb3dlcl9zdXBwbHkuaCAgICAgIHwgICAgMyArKy0KIDIgZmlsZXMgY2hh bmdlZCwgOCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZl cnMvcG93ZXIvcG93ZXJfc3VwcGx5X2NvcmUuYyBiL2RyaXZlcnMvcG93ZXIvcG93ZXJfc3VwcGx5 X2NvcmUuYwppbmRleCBjY2U3NWI0Li41NzdhMTMxIDEwMDY0NAotLS0gYS9kcml2ZXJzL3Bvd2Vy L3Bvd2VyX3N1cHBseV9jb3JlLmMKKysrIGIvZHJpdmVycy9wb3dlci9wb3dlcl9zdXBwbHlfY29y ZS5jCkBAIC0zOSw3ICszOSw3IEBAIHN0YXRpYyBpbnQgX19wb3dlcl9zdXBwbHlfY2hhbmdlZF93 b3JrKHN0cnVjdCBkZXZpY2UgKmRldiwgdm9pZCAqZGF0YSkKIHN0YXRpYyB2b2lkIHBvd2VyX3N1 cHBseV9jaGFuZ2VkX3dvcmsoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogewogCXN0cnVjdCBw b3dlcl9zdXBwbHkgKnBzeSA9IGNvbnRhaW5lcl9vZih3b3JrLCBzdHJ1Y3QgcG93ZXJfc3VwcGx5 LAotCQkJCQkJY2hhbmdlZF93b3JrKTsKKwkJCQkJCWNoYW5nZWRfd29yay53b3JrKTsKIAogCWRl dl9kYmcocHN5LT5kZXYsICIlc1xuIiwgX19mdW5jX18pOwogCkBAIC01NSw3ICs1NSw3IEBAIHZv aWQgcG93ZXJfc3VwcGx5X2NoYW5nZWQoc3RydWN0IHBvd2VyX3N1cHBseSAqcHN5KQogewogCWRl dl9kYmcocHN5LT5kZXYsICIlc1xuIiwgX19mdW5jX18pOwogCi0Jc2NoZWR1bGVfd29yaygmcHN5 LT5jaGFuZ2VkX3dvcmspOworCXNjaGVkdWxlX3N1c3BlbmRfYmxvY2tpbmdfd29yaygmcHN5LT5j aGFuZ2VkX3dvcmspOwogfQogRVhQT1JUX1NZTUJPTF9HUEwocG93ZXJfc3VwcGx5X2NoYW5nZWQp OwogCkBAIC0xNTUsNyArMTU1LDggQEAgaW50IHBvd2VyX3N1cHBseV9yZWdpc3RlcihzdHJ1Y3Qg ZGV2aWNlICpwYXJlbnQsIHN0cnVjdCBwb3dlcl9zdXBwbHkgKnBzeSkKIAkJZ290byBkZXZfY3Jl YXRlX2ZhaWxlZDsKIAl9CiAKLQlJTklUX1dPUksoJnBzeS0+Y2hhbmdlZF93b3JrLCBwb3dlcl9z dXBwbHlfY2hhbmdlZF93b3JrKTsKKwlzdXNwZW5kX2Jsb2NraW5nX3dvcmtfaW5pdCgmcHN5LT5j aGFuZ2VkX3dvcmssCisJCQkJICAgcG93ZXJfc3VwcGx5X2NoYW5nZWRfd29yaywgInBvd2VyLXN1 cHBseSIpOwogCiAJcmMgPSBwb3dlcl9zdXBwbHlfY3JlYXRlX2F0dHJzKHBzeSk7CiAJaWYgKHJj KQpAQCAtMTcyLDYgKzE3Myw3IEBAIGludCBwb3dlcl9zdXBwbHlfcmVnaXN0ZXIoc3RydWN0IGRl dmljZSAqcGFyZW50LCBzdHJ1Y3QgcG93ZXJfc3VwcGx5ICpwc3kpCiBjcmVhdGVfdHJpZ2dlcnNf ZmFpbGVkOgogCXBvd2VyX3N1cHBseV9yZW1vdmVfYXR0cnMocHN5KTsKIGNyZWF0ZV9hdHRyc19m YWlsZWQ6CisJc3VzcGVuZF9ibG9ja2luZ193b3JrX2Rlc3Ryb3koJnBzeS0+Y2hhbmdlZF93b3Jr KTsKIAlkZXZpY2VfdW5yZWdpc3Rlcihwc3ktPmRldik7CiBkZXZfY3JlYXRlX2ZhaWxlZDoKIHN1 Y2Nlc3M6CkBAIC0xODQsNiArMTg2LDcgQEAgdm9pZCBwb3dlcl9zdXBwbHlfdW5yZWdpc3Rlcihz dHJ1Y3QgcG93ZXJfc3VwcGx5ICpwc3kpCiAJZmx1c2hfc2NoZWR1bGVkX3dvcmsoKTsKIAlwb3dl cl9zdXBwbHlfcmVtb3ZlX3RyaWdnZXJzKHBzeSk7CiAJcG93ZXJfc3VwcGx5X3JlbW92ZV9hdHRy cyhwc3kpOworCXN1c3BlbmRfYmxvY2tpbmdfd29ya19kZXN0cm95KCZwc3ktPmNoYW5nZWRfd29y ayk7CiAJZGV2aWNlX3VucmVnaXN0ZXIocHN5LT5kZXYpOwogfQogRVhQT1JUX1NZTUJPTF9HUEwo cG93ZXJfc3VwcGx5X3VucmVnaXN0ZXIpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9wb3dl cl9zdXBwbHkuaCBiL2luY2x1ZGUvbGludXgvcG93ZXJfc3VwcGx5LmgKaW5kZXggZWJkMmI4Zi4u ZjY0MTJjOCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9saW51eC9wb3dlcl9zdXBwbHkuaAorKysgYi9p bmNsdWRlL2xpbnV4L3Bvd2VyX3N1cHBseS5oCkBAIC0xNCw2ICsxNCw3IEBACiAjZGVmaW5lIF9f TElOVVhfUE9XRVJfU1VQUExZX0hfXwogCiAjaW5jbHVkZSA8bGludXgvZGV2aWNlLmg+CisjaW5j bHVkZSA8bGludXgvc3VzcGVuZC5oPgogI2luY2x1ZGUgPGxpbnV4L3dvcmtxdWV1ZS5oPgogI2lu Y2x1ZGUgPGxpbnV4L2xlZHMuaD4KIApAQCAtMTUyLDcgKzE1Myw3IEBAIHN0cnVjdCBwb3dlcl9z dXBwbHkgewogCiAJLyogcHJpdmF0ZSAqLwogCXN0cnVjdCBkZXZpY2UgKmRldjsKLQlzdHJ1Y3Qg d29ya19zdHJ1Y3QgY2hhbmdlZF93b3JrOworCXN0cnVjdCBzdXNwZW5kX2Jsb2NraW5nX3dvcmsg Y2hhbmdlZF93b3JrOwogCiAjaWZkZWYgQ09ORklHX0xFRFNfVFJJR0dFUlMKIAlzdHJ1Y3QgbGVk X3RyaWdnZXIgKmNoYXJnaW5nX2Z1bGxfdHJpZzsKLS0gCjEuNi41LjEKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LXBtIG1haWxpbmcgbGlzdAps aW51eC1wbUBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xpc3RzLmxpbnV4LWZv dW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcG0= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752601Ab0ENELw (ORCPT ); Fri, 14 May 2010 00:11:52 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:51269 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752171Ab0ENELo (ORCPT ); Fri, 14 May 2010 00:11:44 -0400 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Anton Vorontsov , David Woodhouse , Daniel Mack , Andres Salomon , Len Brown , Mark Brown Subject: [PATCH 8/8] power_supply: Block suspend while power supply change notifications are pending Date: Thu, 13 May 2010 21:11:13 -0700 Message-Id: <1273810273-3039-9-git-send-email-arve@android.com> X-Mailer: git-send-email 1.6.5.1 In-Reply-To: <1273810273-3039-8-git-send-email-arve@android.com> References: <1273810273-3039-1-git-send-email-arve@android.com> <1273810273-3039-2-git-send-email-arve@android.com> <1273810273-3039-3-git-send-email-arve@android.com> <1273810273-3039-4-git-send-email-arve@android.com> <1273810273-3039-5-git-send-email-arve@android.com> <1273810273-3039-6-git-send-email-arve@android.com> <1273810273-3039-7-git-send-email-arve@android.com> <1273810273-3039-8-git-send-email-arve@android.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When connecting usb or the charger the device would often go back to sleep before the charge led and screen turned on. Signed-off-by: Arve Hjønnevåg --- drivers/power/power_supply_core.c | 9 ++++++--- include/linux/power_supply.h | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index cce75b4..577a131 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -39,7 +39,7 @@ static int __power_supply_changed_work(struct device *dev, void *data) static void power_supply_changed_work(struct work_struct *work) { struct power_supply *psy = container_of(work, struct power_supply, - changed_work); + changed_work.work); dev_dbg(psy->dev, "%s\n", __func__); @@ -55,7 +55,7 @@ void power_supply_changed(struct power_supply *psy) { dev_dbg(psy->dev, "%s\n", __func__); - schedule_work(&psy->changed_work); + schedule_suspend_blocking_work(&psy->changed_work); } EXPORT_SYMBOL_GPL(power_supply_changed); @@ -155,7 +155,8 @@ int power_supply_register(struct device *parent, struct power_supply *psy) goto dev_create_failed; } - INIT_WORK(&psy->changed_work, power_supply_changed_work); + suspend_blocking_work_init(&psy->changed_work, + power_supply_changed_work, "power-supply"); rc = power_supply_create_attrs(psy); if (rc) @@ -172,6 +173,7 @@ int power_supply_register(struct device *parent, struct power_supply *psy) create_triggers_failed: power_supply_remove_attrs(psy); create_attrs_failed: + suspend_blocking_work_destroy(&psy->changed_work); device_unregister(psy->dev); dev_create_failed: success: @@ -184,6 +186,7 @@ void power_supply_unregister(struct power_supply *psy) flush_scheduled_work(); power_supply_remove_triggers(psy); power_supply_remove_attrs(psy); + suspend_blocking_work_destroy(&psy->changed_work); device_unregister(psy->dev); } EXPORT_SYMBOL_GPL(power_supply_unregister); diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index ebd2b8f..f6412c8 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h @@ -14,6 +14,7 @@ #define __LINUX_POWER_SUPPLY_H__ #include +#include #include #include @@ -152,7 +153,7 @@ struct power_supply { /* private */ struct device *dev; - struct work_struct changed_work; + struct suspend_blocking_work changed_work; #ifdef CONFIG_LEDS_TRIGGERS struct led_trigger *charging_full_trig; -- 1.6.5.1