From patchwork Mon Jan 21 12:03:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 2011761 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 545603FD1A for ; Mon, 21 Jan 2013 12:14:14 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TxGDG-0001AA-57; Mon, 21 Jan 2013 12:10:54 +0000 Received: from mail-wg0-f48.google.com ([74.125.82.48]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TxG8U-0006ZS-0W for linux-arm-kernel@lists.infradead.org; Mon, 21 Jan 2013 12:06:12 +0000 Received: by mail-wg0-f48.google.com with SMTP id 16so355179wgi.3 for ; Mon, 21 Jan 2013 04:04:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=/Mh1bNAPmvKewBFCrFVQJy8ak/aoekyj/unG4V78m3o=; b=UEkf/LFrNaZPT/2wUG6lzug2xLmDYamF7pi5oUZ2kzeY0u9yC4Y4nRBT136G6UDf1g AhmlEx4N5nPJYmmfXZvJ45bYYsFwjAc89XeuF30v8MRDOLUGISzsnZ3r8MFH0g4BQ0sG dk+ql4nXkuk233GHaNDGLWYcgqkOWEiDx4p83ELtBA1z9rbUfS1RaDCATVJbL9i9EEEX j9K0oMjtQCOx9LWFHWWbGJyv2WIvzKTiMMph823FOWVohWKXPTiSewjeWkQF8zR68q4p a4ip5uwQ34nNnbfxV6BwKJGMAJClJgY42Ll2eVYsxfzwSaQ3T/e0EnLCh3PByD6VDhzr u0ow== X-Received: by 10.180.77.68 with SMTP id q4mr14998494wiw.10.1358769888647; Mon, 21 Jan 2013 04:04:48 -0800 (PST) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id i2sm16575305wiw.3.2013.01.21.04.04.46 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:04:47 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/24] ab8500-bm: Flush all work queues before suspending Date: Mon, 21 Jan 2013 12:03:52 +0000 Message-Id: <1358769840-4763-17-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> References: <1358769840-4763-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmmKlyzdocpSzoSfYw8eYKnkzSDWBYSnITZAAhP/HOPVWH104OyBtBlTnuxoQkpwM/jxYPf X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130121_070558_232238_704D9FE4 X-CRM114-Status: GOOD ( 11.43 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.48 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linus.walleij@stericsson.com, Jonas Aaberg , cbou@mail.ru, anton.vorontsov@linaro.org, arnd@arndb.de, Lee Jones X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Jonas Aaberg Flush all workqueues at suspend time to avoid suspending during work. Signed-off-by: Lee Jones Signed-off-by: Jonas Aaberg Reviewed-by: Marcus COOPER Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/61915 --- drivers/power/ab8500_charger.c | 11 +++++++++++ drivers/power/ab8500_fg.c | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c index da965ee..a632b94 100644 --- a/drivers/power/ab8500_charger.c +++ b/drivers/power/ab8500_charger.c @@ -2866,6 +2866,17 @@ static int ab8500_charger_suspend(struct platform_device *pdev, if (delayed_work_pending(&di->check_hw_failure_work)) cancel_delayed_work(&di->check_hw_failure_work); + flush_delayed_work(&di->attach_work); + flush_delayed_work(&di->usb_charger_attached_work); + flush_delayed_work(&di->ac_charger_attached_work); + flush_delayed_work(&di->check_usbchgnotok_work); + flush_delayed_work(&di->check_vbat_work); + flush_delayed_work(&di->kick_wd_work); + + flush_work(&di->usb_link_status_work); + flush_work(&di->ac_work); + flush_work(&di->detect_usb_type_work); + return 0; } #else diff --git a/drivers/power/ab8500_fg.c b/drivers/power/ab8500_fg.c index 0378aab..1a78116 100644 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power/ab8500_fg.c @@ -2410,6 +2410,11 @@ static int ab8500_fg_suspend(struct platform_device *pdev, struct ab8500_fg *di = platform_get_drvdata(pdev); flush_delayed_work(&di->fg_periodic_work); + flush_work(&di->fg_work); + flush_work(&di->fg_acc_cur_work); + flush_delayed_work(&di->fg_reinit_work); + flush_delayed_work(&di->fg_low_bat_work); + flush_delayed_work(&di->fg_check_hw_failure_work); /* * If the FG is enabled we will disable it before going to suspend