From patchwork Thu Aug 4 14:53:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1035912 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p74EqWOv022409 for ; Thu, 4 Aug 2011 14:52:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753639Ab1HDOwa (ORCPT ); Thu, 4 Aug 2011 10:52:30 -0400 Received: from na3sys009aog125.obsmtp.com ([74.125.149.153]:55180 "EHLO na3sys009aog125.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751560Ab1HDOwa (ORCPT ); Thu, 4 Aug 2011 10:52:30 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]) (using TLSv1) by na3sys009aob125.postini.com ([74.125.148.12]) with SMTP ID DSNKTjqyLaVVbAfSHHnOmghPwYnD5AmKfkp1@postini.com; Thu, 04 Aug 2011 07:52:29 PDT Received: by mail-gx0-f174.google.com with SMTP id 21so1393357gxk.5 for ; Thu, 04 Aug 2011 07:52:29 -0700 (PDT) Received: by 10.142.254.21 with SMTP id b21mr904698wfi.249.1312469548716; Thu, 04 Aug 2011 07:52:28 -0700 (PDT) Received: from localhost (c-24-19-7-36.hsd1.wa.comcast.net [24.19.7.36]) by mx.google.com with ESMTPS id a5sm980095pbe.62.2011.08.04.07.52.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 04 Aug 2011 07:52:27 -0700 (PDT) From: Kevin Hilman To: Ben Dooks , linux-i2c@vger.kernel.org Cc: linux-omap@vger.kernel.org, Shubhrajyoti D Subject: [PATCH v2] Revert "i2c-omap: fix static suspend vs. runtime suspend" Date: Thu, 4 Aug 2011 07:53:02 -0700 Message-Id: <1312469582-13189-1-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 04 Aug 2011 14:52:32 +0000 (UTC) This reverts commit adf6e07922255937c8bfeea777d19502b4c9a2be. Remove system PM methods which can race with runtime PM methods. Also, as of v3.1, the PM domain level code for OMAP handles device power state transistions automatically for devices, so drivers no longer need to specifically call the bus/pm_domain methods themselves. Signed-off-by: Kevin Hilman --- v2: updated changelog to remove cliff-hanger ending drivers/i2c/busses/i2c-omap.c | 29 ----------------------------- 1 files changed, 0 insertions(+), 29 deletions(-) diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 84df53f..e854be0 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -1148,41 +1148,12 @@ omap_i2c_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_SUSPEND -static int omap_i2c_suspend(struct device *dev) -{ - if (!pm_runtime_suspended(dev)) - if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_suspend) - dev->bus->pm->runtime_suspend(dev); - - return 0; -} - -static int omap_i2c_resume(struct device *dev) -{ - if (!pm_runtime_suspended(dev)) - if (dev->bus && dev->bus->pm && dev->bus->pm->runtime_resume) - dev->bus->pm->runtime_resume(dev); - - return 0; -} - -static struct dev_pm_ops omap_i2c_pm_ops = { - .suspend = omap_i2c_suspend, - .resume = omap_i2c_resume, -}; -#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops) -#else -#define OMAP_I2C_PM_OPS NULL -#endif - static struct platform_driver omap_i2c_driver = { .probe = omap_i2c_probe, .remove = omap_i2c_remove, .driver = { .name = "omap_i2c", .owner = THIS_MODULE, - .pm = OMAP_I2C_PM_OPS, }, };