Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...

[karo-tx-linux.git] / drivers / input / serio / i8042-unicore32io.h

diff --git a/drivers/input/serio/i8042-unicore32io.h b/drivers/input/serio/i8042-unicore32io.h
index 2cdd8726446fc15131e3089b49633d19548ca654..73f5cc124a3606a5cb73406e207d8a27fd4c339e 100644 (file)
--- a/drivers/input/serio/i8042-unicore32io.h
+++ b/drivers/input/serio/i8042-unicore32io.h
@@ -29,11 +29,11 @@
 /*
  * Register numbers.
  */
-#define I8042_COMMAND_REG      ((volatile void __iomem *)&PS2_COMMAND)
-#define I8042_STATUS_REG       ((volatile void __iomem *)&PS2_STATUS)
-#define I8042_DATA_REG         ((volatile void __iomem *)&PS2_DATA)
+#define I8042_COMMAND_REG      PS2_COMMAND
+#define I8042_STATUS_REG       PS2_STATUS
+#define I8042_DATA_REG         PS2_DATA
 
-#define I8042_REGION_START     (resource_size_t)(&PS2_DATA)
+#define I8042_REGION_START     (resource_size_t)(PS2_DATA)
 #define I8042_REGION_SIZE      (resource_size_t)(16)
 
 static inline int i8042_read_data(void)
@@ -58,7 +58,7 @@ static inline void i8042_write_command(int val)
 
 static inline int i8042_platform_init(void)
 {
-       if (!request_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
+       if (!request_mem_region(I8042_REGION_START, I8042_REGION_SIZE, "i8042"))
                return -EBUSY;
 
        i8042_reset = 1;
@@ -67,7 +67,7 @@ static inline int i8042_platform_init(void)
 
 static inline void i8042_platform_exit(void)
 {
-       release_region(I8042_REGION_START, I8042_REGION_SIZE);
+       release_mem_region(I8042_REGION_START, I8042_REGION_SIZE);
 }
 
 #endif /* _I8042_UNICORE32_H */