From patchwork Thu Jun 19 05:21:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4380651 Return-Path: X-Original-To: patchwork-linux-samsung-soc@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 CF7F49F1C4 for ; Thu, 19 Jun 2014 05:21:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 069AD202D1 for ; Thu, 19 Jun 2014 05:21:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 031242026F for ; Thu, 19 Jun 2014 05:21:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757327AbaFSFVZ (ORCPT ); Thu, 19 Jun 2014 01:21:25 -0400 Received: from mail-yh0-f73.google.com ([209.85.213.73]:47969 "EHLO mail-yh0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757321AbaFSFVY (ORCPT ); Thu, 19 Jun 2014 01:21:24 -0400 Received: by mail-yh0-f73.google.com with SMTP id f10so253373yha.4 for ; Wed, 18 Jun 2014 22:21:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=poVGIFKE5iWpsX+MO1iBbzKTs+wjR3csi8yaGCA5Y2c=; b=LIwZfOupSwLNnAsuMGNKaYNPdg1iux2vBxJI+KrLuGVJmr8H6h8HJkRiRwZ7loXVwX TJjfuYOwUIoDTKRVDDMupDEe40B8bHigC/ijN41gjSxxcjsVpCGjvWucgiwLmV6RBTt1 /Hn5BFWGmL6ITQnQ3B16zBamLsZzWY7QL5NxcKFBT8s6cKbu6dyYvTxKqPIDzM94tOY6 /QDGi20XpX/qVIg8nKVBHpgh8oHeylGWmbQDDcXd1shOPfMavEHOQO4JE27CdSQVpJWc 3QQnqGxmRj/L9JTVWLQxgzR7GMItfNc5wrFU4Wg6RWg7/B+F2fqrIPfxhzlOHGvSYLym w+1w== X-Gm-Message-State: ALoCoQkHPv89L1k3lxxXUbRTQXoku6IH6xu0E5lwIY5atpBM72QJBtD4QnatYSUhHeKL1c2IRKjo X-Received: by 10.236.47.163 with SMTP id t23mr1217685yhb.41.1403155283598; Wed, 18 Jun 2014 22:21:23 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id j5si304955yhi.1.2014.06.18.22.21.23 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jun 2014 22:21:23 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 70C2031C525; Wed, 18 Jun 2014 22:21:23 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 12C9D808AF; Wed, 18 Jun 2014 22:21:22 -0700 (PDT) From: Doug Anderson To: Wolfram Sang , Kukjin Kim Cc: Tomasz Figa , javier.martinez@collabora.co.uk, ch.naveen@samsung.com, Doug Anderson , jg1.han@samsung.com, jdelvare@suse.de, sjg@google.com, paul.gortmaker@windriver.com, standby24x7@gmail.com, sachin.kamat@linaro.org, linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] i2c: exynos5: Properly use the "noirq" variants of suspend/resume Date: Wed, 18 Jun 2014 22:21:13 -0700 Message-Id: <1403155273-1057-1-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.0.0.526.g5318336 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 The original code for the exynos i2c controller registered for the "noirq" variants. However during review feedback it was moved to SIMPLE_DEV_PM_OPS without anyone noticing that it meant we were no longer actually "noirq" (despite functions named exynos5_i2c_suspend_noirq and exynos5_i2c_resume_noirq). i2c controllers that might have wakeup sources on them seem to need to resume at noirq time so that the individual drivers can actually read the i2c bus to handle their wakeup. NOTE: I took the original review feedback from Wolfram and added poweroff, thaw, freeze, restore. This patch has only been compile-tested since I don't have all the patches needed to make my machine using this i2c driver actually suspend/resume. Signed-off-by: Doug Anderson --- drivers/i2c/busses/i2c-exynos5.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 63d2292..cba740c 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -789,8 +789,14 @@ static int exynos5_i2c_resume_noirq(struct device *dev) } #endif -static SIMPLE_DEV_PM_OPS(exynos5_i2c_dev_pm_ops, exynos5_i2c_suspend_noirq, - exynos5_i2c_resume_noirq); +const struct dev_pm_ops exynos5_i2c_dev_pm_ops = { + .suspend_noirq = exynos5_i2c_suspend_noirq, + .resume_noirq = exynos5_i2c_resume_noirq, + .freeze_noirq = exynos5_i2c_suspend_noirq, + .thaw_noirq = exynos5_i2c_resume_noirq, + .poweroff_noirq = exynos5_i2c_suspend_noirq, + .restore_noirq = exynos5_i2c_resume_noirq, +}; static struct platform_driver exynos5_i2c_driver = { .probe = exynos5_i2c_probe,