3 files changed, 91 insertions, 16 deletions

diff --git a/arch/cris/include/asm/io.h b/arch/cris/include/asm/io.h
index 32567bc2a421..ac12ae2b9286 100644
--- a/arch/cris/include/asm/io.h
+++ b/arch/cris/include/asm/io.h
@@ -133,12 +133,39 @@ static inline void writel(unsigned int b, volatile void __iomem *addr)
 #define insb(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,1,count) : 0)
 #define insw(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,2,count) : 0)
 #define insl(port,addr,count) (cris_iops ? cris_iops->read_io(port,addr,4,count) : 0)
-#define outb(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,1,1)
-#define outw(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,2,1)
-#define outl(data,port) if (cris_iops) cris_iops->write_io(port,(void*)(unsigned)data,4,1)
-#define outsb(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,1,count)
-#define outsw(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,2,count)
-#define outsl(port,addr,count) if(cris_iops) cris_iops->write_io(port,(void*)addr,3,count)
+static inline void outb(unsigned char data, unsigned int port)
+{
+        if (cris_iops)
+                cris_iops->write_io(port, (void *) &data, 1, 1);
+}
+static inline void outw(unsigned short data, unsigned int port)
+{
+        if (cris_iops)
+                cris_iops->write_io(port, (void *) &data, 2, 1);
+}
+static inline void outl(unsigned int data, unsigned int port)
+{
+        if (cris_iops)
+                cris_iops->write_io(port, (void *) &data, 4, 1);
+}
+static inline void outsb(unsigned int port, const void *addr,
+                         unsigned long count)
+{
+        if (cris_iops)
+                cris_iops->write_io(port, (void *)addr, 1, count);
+}
+static inline void outsw(unsigned int port, const void *addr,
+                         unsigned long count)
+{
+        if (cris_iops)
+                cris_iops->write_io(port, (void *)addr, 2, count);
+}
+static inline void outsl(unsigned int port, const void *addr,
+                         unsigned long count)
+{
+        if (cris_iops)
+                cris_iops->write_io(port, (void *)addr, 4, count);
+}
 
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 04bef4d25b4a..0ae445087607 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -3,6 +3,7 @@ config H8300
         default y
         select HAVE_IDE
         select HAVE_GENERIC_HARDIRQS
+        select GENERIC_ATOMIC64
         select HAVE_UID16
         select ARCH_WANT_IPC_PARSE_VERSION
         select GENERIC_IRQ_SHOW
diff --git a/arch/x86/platform/iris/iris.c b/arch/x86/platform/iris/iris.c
index 5917eb56b313..e6cb80f620af 100644
--- a/arch/x86/platform/iris/iris.c
+++ b/arch/x86/platform/iris/iris.c
@@ -23,6 +23,7 @@
 
 #include <linux/moduleparam.h>
 #include <linux/module.h>
+#include <linux/platform_device.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/delay.h>
@@ -62,29 +63,75 @@ static void iris_power_off(void)
  * by reading its input port and seeing whether the read value is
  * meaningful.
  */
-static int iris_init(void)
+static int iris_probe(struct platform_device *pdev)
 {
-        unsigned char status;
-        if (force != 1) {
-                printk(KERN_ERR "The force parameter has not been set to 1 so the Iris poweroff handler will not be installed.\n");
-                return -ENODEV;
-        }
-        status = inb(IRIS_GIO_INPUT);
+        unsigned char status = inb(IRIS_GIO_INPUT);
         if (status == IRIS_GIO_NODEV) {
-                printk(KERN_ERR "This machine does not seem to be an Iris. Power_off handler not installed.\n");
+                printk(KERN_ERR "This machine does not seem to be an Iris. "
+                        "Power off handler not installed.\n");
                 return -ENODEV;
         }
         old_pm_power_off = pm_power_off;
         pm_power_off = &iris_power_off;
         printk(KERN_INFO "Iris power_off handler installed.\n");
-
         return 0;
 }
 
-static void iris_exit(void)
+static int iris_remove(struct platform_device *pdev)
 {
         pm_power_off = old_pm_power_off;
         printk(KERN_INFO "Iris power_off handler uninstalled.\n");
+        return 0;
+}
+
+static struct platform_driver iris_driver = {
+        .driver         = {
+                .name   = "iris",
+                .owner  = THIS_MODULE,
+        },
+        .probe          = iris_probe,
+        .remove         = iris_remove,
+};
+
+static struct resource iris_resources[] = {
+        {
+                .start  = IRIS_GIO_BASE,
+                .end    = IRIS_GIO_OUTPUT,
+                .flags  = IORESOURCE_IO,
+                .name   = "address"
+        }
+};
+
+static struct platform_device *iris_device;
+
+static int iris_init(void)
+{
+        int ret;
+        if (force != 1) {
+                printk(KERN_ERR "The force parameter has not been set to 1."
+                        " The Iris poweroff handler will not be installed.\n");
+                return -ENODEV;
+        }
+        ret = platform_driver_register(&iris_driver);
+        if (ret < 0) {
+                printk(KERN_ERR "Failed to register iris platform driver: %d\n",
+                        ret);
+                return ret;
+        }
+        iris_device = platform_device_register_simple("iris", (-1),
+                                iris_resources, ARRAY_SIZE(iris_resources));
+        if (IS_ERR(iris_device)) {
+                printk(KERN_ERR "Failed to register iris platform device\n");
+                platform_driver_unregister(&iris_driver);
+                return PTR_ERR(iris_device);
+        }
+        return 0;
+}
+
+static void iris_exit(void)
+{
+        platform_device_unregister(iris_device);
+        platform_driver_unregister(&iris_driver);
 }
 
 module_init(iris_init);