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: 14162 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 490B023E33 for ; Mon, 21 Jan 2013 12:05:07 +0000 (UTC) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by fiordland.canonical.com (Postfix) with ESMTP id F3AB3A18DD2 for ; Mon, 21 Jan 2013 12:05:06 +0000 (UTC) Received: by mail-vc0-f180.google.com with SMTP id fo13so823493vcb.11 for ; Mon, 21 Jan 2013 04:05:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=/Mh1bNAPmvKewBFCrFVQJy8ak/aoekyj/unG4V78m3o=; b=hfa8+kAgl5p2Nx0zRN8irogmghbGEIsYh6xgskavD/MfgxsajZJPCrlQ2UzCbDEXvY 5if1tR9eNoryS0CaDmUzv1r/sNiK9jEHCCFVPHwrKQwkQABckTpUK13cjahZYdLUQBrq 0vjqSDMAovbvKTMajz6LWsGZ5KyLp4QlSRnGfYbNdPIltLZWOXeItr6LPQMA0QLxqjHc dAKm3BVajV1NUrPtX8TA0tooDOt4H1G6nwQ6EqRZHfPBjt/Itr4C3uRW8QIzMe1Q2cta lndKXpq6D5FXtEUkgCbWRGQtmRktYlfFQsnx53udtzggp7eHJaxpe3Y+gQtNVPHzB4dq ujqw== X-Received: by 10.52.176.6 with SMTP id ce6mr16736900vdc.57.1358769906512; Mon, 21 Jan 2013 04:05:06 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp197741veb; Mon, 21 Jan 2013 04:05:06 -0800 (PST) X-Received: by 10.180.79.194 with SMTP id l2mr15061850wix.22.1358769893994; Mon, 21 Jan 2013 04:04:53 -0800 (PST) Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by mx.google.com with ESMTPS id f5si4785829wjb.247.2013.01.21.04.04.53 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Jan 2013 04:04:53 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.174 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.174; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.174 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f174.google.com with SMTP id hq4so7065065wib.1 for ; Mon, 21 Jan 2013 04:04:53 -0800 (PST) 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 Cc: arnd@arndb.de, linus.walleij@stericsson.com, anton.vorontsov@linaro.org, cbou@mail.ru, Jonas Aaberg , Lee Jones 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: ALoCoQmLBgEMOdn8FSccvdp2Eo1nAJQn8f8HMAtX0HfOxYPTPJFliIqFANZNz4uz7O2dV+wxQxbN 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