From patchwork Thu Sep 1 18:12: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: 1120252 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p81IBVmQ014834 for ; Thu, 1 Sep 2011 18:11:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756835Ab1IASL3 (ORCPT ); Thu, 1 Sep 2011 14:11:29 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:51777 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755404Ab1IASL3 (ORCPT ); Thu, 1 Sep 2011 14:11:29 -0400 Received: from mail-gx0-f178.google.com ([209.85.161.178]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKTl/K0L1rkgDGpF2z8+VgbyVr0r0DzZZ5@postini.com; Thu, 01 Sep 2011 11:11:29 PDT Received: by mail-gx0-f178.google.com with SMTP id 8so1927951gxk.23 for ; Thu, 01 Sep 2011 11:11:28 -0700 (PDT) Received: by 10.68.29.193 with SMTP id m1mr462769pbh.92.1314900688379; Thu, 01 Sep 2011 11:11: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 p7sm4765688pbe.0.2011.09.01.11.11.27 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 01 Sep 2011 11:11:27 -0700 (PDT) From: Kevin Hilman To: "Rafael J. Wysocki" Cc: Arnd Bergmann , linux-omap@vger.kernel.org, linux-pm@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] OMAP: omap_device: fix !CONFIG_SUSPEND case in _noirq handlers Date: Thu, 1 Sep 2011 11:12:02 -0700 Message-Id: <1314900722-10252-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 (demeter2.kernel.org [140.211.167.43]); Thu, 01 Sep 2011 18:11:34 +0000 (UTC) The suspend/resume _noirq handlers were #ifdef'd out in the !CONFIG_SUSPEND case, but were still assigned to the dev_pm_ops struct. Fix by defining them to NULL in the !CONFIG_SUSPEND case. Reported-by: Arnd Bergmann Signed-off-by: Kevin Hilman Acked-by: Arnd Bergmann --- Applies to v3.1-rc4. arch/arm/plat-omap/omap_device.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/plat-omap/omap_device.c b/arch/arm/plat-omap/omap_device.c index 9a6a538..02609ee 100644 --- a/arch/arm/plat-omap/omap_device.c +++ b/arch/arm/plat-omap/omap_device.c @@ -615,6 +615,9 @@ static int _od_resume_noirq(struct device *dev) return pm_generic_resume_noirq(dev); } +#else +#define _od_suspend_noirq NULL +#define _od_resume_noirq NULL #endif static struct dev_pm_domain omap_device_pm_domain = {