1 files changed, 11 insertions, 8 deletions

diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index 665517c05eaf..1ad4724458de 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -14,16 +14,19 @@
 #ifndef _UIO_DRIVER_H_
 #define _UIO_DRIVER_H_
 
-#include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/interrupt.h>
 
+struct module;
 struct uio_map;
 
 /**
  * struct uio_mem - description of a UIO memory region
  * @name:               name of the memory region for identification
- * @addr:               address of the device's memory
+ * @addr:               address of the device's memory (phys_addr is used since
+ *                      addr can be logical, virtual, or physical & phys_addr_t
+ *                      should always be large enough to handle any of the
+ *                      address types)
  * @size:               size of IO
  * @memtype:            type of memory addr points to
  * @internal_addr:      ioremap-ped version of addr, for driver internal use
@@ -31,7 +34,7 @@ struct uio_map;
  */
 struct uio_mem {
         const char              *name;
-        unsigned long           addr;
+        phys_addr_t             addr;
         unsigned long           size;
         int                     memtype;
         void __iomem            *internal_addr;
@@ -98,11 +101,11 @@ extern int __must_check
         __uio_register_device(struct module *owner,
                               struct device *parent,
                               struct uio_info *info);
-static inline int __must_check
-        uio_register_device(struct device *parent, struct uio_info *info)
-{
-        return __uio_register_device(THIS_MODULE, parent, info);
-}
+
+/* use a define to avoid include chaining to get THIS_MODULE */
+#define uio_register_device(parent, info) \
+        __uio_register_device(THIS_MODULE, parent, info)
+
 extern void uio_unregister_device(struct uio_info *info);
 extern void uio_event_notify(struct uio_info *info);