From patchwork Mon Jun 6 17:57:35 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 853012 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p56HuoGA031600 for ; Mon, 6 Jun 2011 17:56:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754566Ab1FFR4t (ORCPT ); Mon, 6 Jun 2011 13:56:49 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:60274 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751665Ab1FFR4t (ORCPT ); Mon, 6 Jun 2011 13:56:49 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 32A451B067C; Mon, 6 Jun 2011 19:41:14 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 15961-06; Mon, 6 Jun 2011 19:40:57 +0200 (CEST) Received: from ferrari.rjw.lan (ofq162.internetdsl.tpnet.pl [95.51.144.162]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 1862A1B070A; Mon, 6 Jun 2011 19:40:57 +0200 (CEST) From: "Rafael J. Wysocki" To: Tony Luck Subject: Re: [PATCH 5/8] PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev Date: Mon, 6 Jun 2011 19:57:35 +0200 User-Agent: KMail/1.13.6 (Linux/2.6.39+; KDE/4.6.0; x86_64; ; ) Cc: LKML , Len Brown , Greg KH , Kay Sievers , Jesse Barnes , Linux PM mailing list , "H. Peter Anvin" , mingo@redhat.com, tglx@linutronix.de, Dave Jones , Alan Stern , Avi Kivity , linux-pci@vger.kernel.org References: <201103100131.58206.rjw@sisk.pl> <201103122218.14832.rjw@sisk.pl> In-Reply-To: MIME-Version: 1.0 Message-Id: <201106061957.35413.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@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]); Mon, 06 Jun 2011 17:56:50 +0000 (UTC) On Thursday, June 02, 2011, Tony Luck wrote: > On Sat, Mar 12, 2011 at 1:18 PM, Rafael J. Wysocki wrote: > > -static int __init init_iommu_sysfs(void) > > -{ > > - return 0; > > -} > > +static inline int init_iommu_pm_ops(void) { } > > #endif /* CONFIG_PM */ > > drivers/pci/intel-iommu.c:3391: warning: no return statement in > function returning non-void > > s/static inline int/static inline void/ > > Reported-by: Tony Luck I guess you mean the following? Rafael --- From: Rafael J. Wysocki If CONFIG_PM is not set, init_iommu_pm_ops() introduced by commit 134fac3f457f3dd753ecdb25e6da3e5f6629f696 (PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev) is not defined appropriately. Fix this issue. Reported-by: Tony Luck Signed-off-by: Rafael J. Wysocki --- drivers/pci/intel-iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/pci/intel-iommu.c =================================================================== --- linux-2.6.orig/drivers/pci/intel-iommu.c +++ linux-2.6/drivers/pci/intel-iommu.c @@ -3388,7 +3388,7 @@ static void __init init_iommu_pm_ops(voi } #else -static inline int init_iommu_pm_ops(void) { } +static inline void init_iommu_pm_ops(void) {} #endif /* CONFIG_PM */ /*