From patchwork Wed Aug 24 23:43:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1094622 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 p7ONhZOA003861 for ; Wed, 24 Aug 2011 23:43:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751791Ab1HXXng (ORCPT ); Wed, 24 Aug 2011 19:43:36 -0400 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:60851 "EHLO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750803Ab1HXXng (ORCPT ); Wed, 24 Aug 2011 19:43:36 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKTlWMpyyrX8MRmBTj4+bWO3rtx5+W1DXF@postini.com; Wed, 24 Aug 2011 16:43:36 PDT Received: by mail-pz0-f42.google.com with SMTP id 37so1825789pzk.29 for ; Wed, 24 Aug 2011 16:43:35 -0700 (PDT) Received: by 10.142.52.4 with SMTP id z4mr2866028wfz.437.1314229415299; Wed, 24 Aug 2011 16:43:35 -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 e3sm383070pbi.7.2011.08.24.16.43.34 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 24 Aug 2011 16:43:34 -0700 (PDT) From: Kevin Hilman To: "Rafael J. Wysocki" , Santosh Shilimkar Cc: linux-omap@vger.kernel.org, linux-pm@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/1] OMAP: omap_device: only override _noirq methods, not normal suspend/resume Date: Wed, 24 Aug 2011 16:43:57 -0700 Message-Id: <1314229437-31836-2-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1314229437-31836-1-git-send-email-khilman@ti.com> References: <1314229437-31836-1-git-send-email-khilman@ti.com> 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]); Wed, 24 Aug 2011 23:43:37 +0000 (UTC) commit c03f007a8bf0e092caeb6856a5c8a850df10b974 (OMAP: PM: omap_device: add system PM methods for PM domain handling) mistakenly used SET_SYSTEM_SLEEP_PM_OPS() when trying to configure custom methods for the PM domains noirq methods. Fix that by setting only the suspend_noirq and resume_noirq methods with custom versions. Note that all other PM domain methods (including the "normal" suspend/resume methods) are populated using USE_PLATFORM_PM_SLEEP_OPS, which configures them all to the default subsystem (platform_bus) methods. Reported-by: Santosh Shilimkar Tested-by: Santosh Shilimkar Signed-off-by: Kevin Hilman --- arch/arm/plat-omap/omap_device.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index b6b4097..9a6a538 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -622,7 +622,8 @@ static struct dev_pm_domain omap_device_pm_domain = { SET_RUNTIME_PM_OPS(_od_runtime_suspend, _od_runtime_resume, _od_runtime_idle) USE_PLATFORM_PM_SLEEP_OPS - SET_SYSTEM_SLEEP_PM_OPS(_od_suspend_noirq, _od_resume_noirq) + .suspend_noirq = _od_suspend_noirq, + .resume_noirq = _od_resume_noirq, } };