[linux-pm] [PATCH 5/8] PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev

[Rafael J. Wysocki]

On Thursday, June 02, 2011, Tony Luck wrote:
> On Sat, Mar 12, 2011 at 1:18 PM, Rafael J. Wysocki <rjw at sisk.pl> 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 <tony.luck at intel.com>

I guess you mean the following?

Rafael

---
From: Rafael J. Wysocki <rjw at sisk.pl>

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 <tony.luck at intel.com>
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
---
 drivers/pci/intel-iommu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */
 
 /*