From patchwork Wed Jun 25 16:39:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 4421871 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 2986B9F1D6 for ; Wed, 25 Jun 2014 16:39:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35FC820304 for ; Wed, 25 Jun 2014 16:39:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A94520259 for ; Wed, 25 Jun 2014 16:39:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757304AbaFYQje (ORCPT ); Wed, 25 Jun 2014 12:39:34 -0400 Received: from mail-pb0-f74.google.com ([209.85.160.74]:41621 "EHLO mail-pb0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757209AbaFYQjd (ORCPT ); Wed, 25 Jun 2014 12:39:33 -0400 Received: by mail-pb0-f74.google.com with SMTP id rq2so291637pbb.1 for ; Wed, 25 Jun 2014 09:39:32 -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=/FX/L/kEjG9ToyTZ2+aVV4+rqhlQA1GkhwfJI8VYG7k=; b=EjY4McikZgeIETsFR6gJp3TbHPipYKcekr6uTZSSpyisRyfL794TTaCjXKX74wz9+1 GrtfVPGWYYaVFJq80wSw+V+MxcEPNxTtX1PA04+wZkEcbxx5DPe1dJg4lA7onC4W8eWY 7CHoo253uV285plXpcEdvg9nnHoMenzWwb9dFpKtMkNFgReVj5rlroGPL3kCNS1PeFwW whiDpSHzm/gq4w0xqLPvcW+MINUm5nn1EsEvNn9wcIL+9tI6FUIH08Hkys8JApW5AApM +aSNeyS4jyvH/mOU5nwjf3weR0L3S38xvlw3geYs2ganr8bzJWI6fb86s+JhQlJnDA2+ TNTA== X-Gm-Message-State: ALoCoQmF+VIWN9+f08YW0OSaCQ5wS+GSNxCnLv0XzN7OutKYjZMnoY3qdH+ZYl4kFIAIx2/9Xzm4 X-Received: by 10.68.135.200 with SMTP id pu8mr4854663pbb.9.1403714372665; Wed, 25 Jun 2014 09:39:32 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id c50si333248yhl.7.2014.06.25.09.39.32 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 Jun 2014 09:39:32 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 77BE45A4415; Wed, 25 Jun 2014 09:39:32 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 177038081F; Wed, 25 Jun 2014 09:39:31 -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 v3] i2c: exynos5: Properly use the "noirq" variants of suspend/resume Date: Wed, 25 Jun 2014 09:39:20 -0700 Message-Id: <1403714360-7581-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 Acked-by: Kukjin Kim --- Changes in v3: - Made the structure static. Changes in v2: - Added missing CONFIG_PM_SLEEP drivers/i2c/busses/i2c-exynos5.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 63d2292..f9447a4 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -789,8 +789,16 @@ 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); +static const struct dev_pm_ops exynos5_i2c_dev_pm_ops = { +#ifdef CONFIG_PM_SLEEP + .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, +#endif +}; static struct platform_driver exynos5_i2c_driver = { .probe = exynos5_i2c_probe,