From: Andrew Morton <akpm@linux-foundation.org>

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Greg KH <greg@kroah.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Satyam Sharma <satyam.sharma@gmail.com>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/device.h |    8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff -puN include/linux/device.h~device_schedule_callback-needs-a-module-reference-fix include/linux/device.h
--- a/include/linux/device.h~device_schedule_callback-needs-a-module-reference-fix
+++ a/include/linux/device.h
@@ -370,11 +370,9 @@ extern void device_remove_bin_file(struc
 extern int device_schedule_callback_owner(struct device *dev,
 		void (*func)(struct device *), struct module *owner);
 
-static inline int device_schedule_callback(struct device *dev,
-		void (*func)(struct device *))
-{
-	return device_schedule_callback_owner(dev, func, THIS_MODULE);
-}
+/* This is a macro to avoid include problems with THIS_MODULE */
+#define device_schedule_callback(dev, func)			\
+	device_schedule_callback_owner(dev, func, THIS_MODULE)
 
 /* device resource management */
 typedef void (*dr_release_t)(struct device *dev, void *res);
_