X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fbase%2Fpower%2Fpower.h;h=41f51fae042f06f06d7548f4ad10463b7b399f4f;hb=d26acd92fa990764b72608a68224f46fac377032;hp=a3252c0e28878fde258ebac8c10ad7c10cafbb86;hpb=5b664cb235e97afbf34db9c4d77f08ebd725335e;p=linux-2.6

diff --git a/drivers/base/power/power.h b/drivers/base/power/power.h
index a3252c0e28..41f51fae04 100644
--- a/drivers/base/power/power.h
+++ b/drivers/base/power/power.h
@@ -1,3 +1,8 @@
+static inline void device_pm_init(struct device *dev)
+{
+	dev->power.status = DPM_ON;
+}
+
 #ifdef CONFIG_PM_SLEEP
 
 /*
@@ -11,12 +16,12 @@ static inline struct device *to_device(struct list_head *entry)
 	return container_of(entry, struct device, power.entry);
 }
 
-extern int device_pm_add(struct device *);
+extern void device_pm_add(struct device *);
 extern void device_pm_remove(struct device *);
 
 #else /* CONFIG_PM_SLEEP */
 
-static inline int device_pm_add(struct device *dev) { return 0; }
+static inline void device_pm_add(struct device *dev) {}
 static inline void device_pm_remove(struct device *dev) {}
 
 #endif