Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: amiga - Floppy platform device conversion
  m68k: amiga - Sound platform device conversion
  m68k: amiga - Frame buffer platform device conversion
  m68k: amiga - Zorro host bridge platform device conversion
  m68k: amiga - Zorro bus modalias support
  platform: Make platform resource input parameters const
  m68k: invoke oom-killer from page fault
  serial167: Kill unused variables
  m68k: Implement generic_find_next_{zero_,}le_bit()
  m68k: hp300 - Checkpatch cleanup
  m68k: Remove trailing spaces in messages
  m68k: Simplify param.h by using <asm-generic/param.h>
  m68k: Remove BKL from rtc implementations

15 files changed, 227 insertions, 166 deletions

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 4b4b565c835f..c5fbe198fbdb 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -187,7 +187,7 @@ EXPORT_SYMBOL_GPL(platform_device_alloc);
  * released.
  */
 int platform_device_add_resources(struct platform_device *pdev,
-                                  struct resource *res, unsigned int num)
+                                  const struct resource *res, unsigned int num)
 {
         struct resource *r;
 
@@ -367,7 +367,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregister);
  */
 struct platform_device *platform_device_register_simple(const char *name,
                                                         int id,
-                                                        struct resource *res,
+                                                        const struct resource *res,
                                                         unsigned int num)
 {
         struct platform_device *pdev;
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 0182a22c423a..832798aa14f6 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -66,6 +66,7 @@
 #include <linux/blkdev.h>
 #include <linux/elevator.h>
 #include <linux/interrupt.h>
+#include <linux/platform_device.h>
 
 #include <asm/setup.h>
 #include <asm/uaccess.h>
@@ -1696,34 +1697,18 @@ static struct kobject *floppy_find(dev_t dev, int *part, void *data)
         return get_disk(unit[drive].gendisk);
 }
 
-static int __init amiga_floppy_init(void)
+static int __init amiga_floppy_probe(struct platform_device *pdev)
 {
         int i, ret;
 
-        if (!MACH_IS_AMIGA)
-                return -ENODEV;
-
-        if (!AMIGAHW_PRESENT(AMI_FLOPPY))
-                return -ENODEV;
-
         if (register_blkdev(FLOPPY_MAJOR,"fd"))
                 return -EBUSY;
 
-        /*
-         *  We request DSKPTR, DSKLEN and DSKDATA only, because the other
-         *  floppy registers are too spreaded over the custom register space
-         */
-        ret = -EBUSY;
-        if (!request_mem_region(CUSTOM_PHYSADDR+0x20, 8, "amiflop [Paula]")) {
-                printk("fd: cannot get floppy registers\n");
-                goto out_blkdev;
-        }
-
         ret = -ENOMEM;
         if ((raw_buf = (char *)amiga_chip_alloc (RAW_BUF_SIZE, "Floppy")) ==
             NULL) {
                 printk("fd: cannot get chip mem buffer\n");
-                goto out_memregion;
+                goto out_blkdev;
         }
 
         ret = -EBUSY;
@@ -1792,18 +1777,13 @@ out_irq2:
         free_irq(IRQ_AMIGA_DSKBLK, NULL);
 out_irq:
         amiga_chip_free(raw_buf);
-out_memregion:
-        release_mem_region(CUSTOM_PHYSADDR+0x20, 8);
 out_blkdev:
         unregister_blkdev(FLOPPY_MAJOR,"fd");
         return ret;
 }
 
-module_init(amiga_floppy_init);
-#ifdef MODULE
-
 #if 0 /* not safe to unload */
-void cleanup_module(void)
+static int __exit amiga_floppy_remove(struct platform_device *pdev)
 {
         int i;
 
@@ -1820,12 +1800,25 @@ void cleanup_module(void)
         custom.dmacon = DMAF_DISK; /* disable DMA */
         amiga_chip_free(raw_buf);
         blk_cleanup_queue(floppy_queue);
-        release_mem_region(CUSTOM_PHYSADDR+0x20, 8);
         unregister_blkdev(FLOPPY_MAJOR, "fd");
 }
 #endif
 
-#else
+static struct platform_driver amiga_floppy_driver = {
+        .driver   = {
+                .name   = "amiga-floppy",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init amiga_floppy_init(void)
+{
+        return platform_driver_probe(&amiga_floppy_driver, amiga_floppy_probe);
+}
+
+module_init(amiga_floppy_init);
+
+#ifndef MODULE
 static int __init amiga_floppy_setup (char *str)
 {
         int n;
@@ -1840,3 +1833,5 @@ static int __init amiga_floppy_setup (char *str)
 
 __setup("floppy=", amiga_floppy_setup);
 #endif
+
+MODULE_ALIAS("platform:amiga-floppy");
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c
index 8dfd24721a82..78a62ebe75c7 100644
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
@@ -627,7 +627,6 @@ static irqreturn_t cd2401_rx_interrupt(int irq, void *dev_id)
         char data;
         int char_count;
         int save_cnt;
-        int len;
 
         /* determine the channel and change to that context */
         channel = (u_short) (base_addr[CyLICR] >> 2);
@@ -1528,7 +1527,6 @@ static int
 cy_ioctl(struct tty_struct *tty, struct file *file,
          unsigned int cmd, unsigned long arg)
 {
-        unsigned long val;
         struct cyclades_port *info = tty->driver_data;
         int ret_val = 0;
         void __user *argp = (void __user *)arg;
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index ed5e9742be2c..a8f0512bad38 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -674,6 +674,7 @@ static struct zorro_device_id a2065_zorro_tbl[] __devinitdata = {
         { ZORRO_PROD_AMERISTAR_A2065 },
         { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, a2065_zorro_tbl);
 
 static struct zorro_driver a2065_driver = {
         .name           = "a2065",
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index fa1a2354f5f9..4b30a46486e2 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -145,6 +145,7 @@ static struct zorro_device_id ariadne_zorro_tbl[] __devinitdata = {
     { ZORRO_PROD_VILLAGE_TRONIC_ARIADNE },
     { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, ariadne_zorro_tbl);
 
 static struct zorro_driver ariadne_driver = {
     .name       = "ariadne",
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index 24724b4ad709..07d8e5b634f3 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -71,6 +71,7 @@ static struct zorro_device_id hydra_zorro_tbl[] __devinitdata = {
     { ZORRO_PROD_HYDRA_SYSTEMS_AMIGANET },
     { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, hydra_zorro_tbl);
 
 static struct zorro_driver hydra_driver = {
     .name       = "hydra",
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index 81c753a617ab..9548cbb5012a 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -102,6 +102,7 @@ static struct zorro_device_id zorro8390_zorro_tbl[] __devinitdata = {
     { ZORRO_PROD_INDIVIDUAL_COMPUTERS_X_SURF, },
     { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, zorro8390_zorro_tbl);
 
 static struct zorro_driver zorro8390_driver = {
     .name       = "zorro8390",
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c
index 105449c15fa9..e17764d71476 100644
--- a/drivers/scsi/zorro7xx.c
+++ b/drivers/scsi/zorro7xx.c
@@ -69,6 +69,7 @@ static struct zorro_device_id zorro7xx_zorro_tbl[] __devinitdata = {
         },
         { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, zorro7xx_zorro_tbl);
 
 static int __devinit zorro7xx_init_one(struct zorro_dev *z,
                                        const struct zorro_device_id *ent)
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index dca48df98444..e5d6b56d4447 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -50,8 +50,9 @@
 #include <linux/fb.h>
 #include <linux/init.h>
 #include <linux/ioport.h>
-
+#include <linux/platform_device.h>
 #include <linux/uaccess.h>
+
 #include <asm/system.h>
 #include <asm/irq.h>
 #include <asm/amigahw.h>
@@ -1135,7 +1136,7 @@ static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg
          * Interface to the low level console driver
          */
 
-static void amifb_deinit(void);
+static void amifb_deinit(struct platform_device *pdev);
 
         /*
          * Internal routines
@@ -2246,7 +2247,7 @@ static inline void chipfree(void)
          * Initialisation
          */
 
-static int __init amifb_init(void)
+static int __init amifb_probe(struct platform_device *pdev)
 {
         int tag, i, err = 0;
         u_long chipptr;
@@ -2261,16 +2262,6 @@ static int __init amifb_init(void)
         }
         amifb_setup(option);
 #endif
-        if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(AMI_VIDEO))
-                return -ENODEV;
-
-        /*
-         * We request all registers starting from bplpt[0]
-         */
-        if (!request_mem_region(CUSTOM_PHYSADDR+0xe0, 0x120,
-                                "amifb [Denise/Lisa]"))
-                return -EBUSY;
-
         custom.dmacon = DMAF_ALL | DMAF_MASTER;
 
         switch (amiga_chipset) {
@@ -2377,6 +2368,7 @@ default_chipset:
         fb_info.fbops = &amifb_ops;
         fb_info.par = &currentpar;
         fb_info.flags = FBINFO_DEFAULT;
+        fb_info.device = &pdev->dev;
 
         if (!fb_find_mode(&fb_info.var, &fb_info, mode_option, ami_modedb,
                           NUM_TOTAL_MODES, &ami_modedb[defmode], 4)) {
@@ -2451,18 +2443,18 @@ default_chipset:
         return 0;
 
 amifb_error:
-        amifb_deinit();
+        amifb_deinit(pdev);
         return err;
 }
 
-static void amifb_deinit(void)
+static void amifb_deinit(struct platform_device *pdev)
 {
         if (fb_info.cmap.len)
                 fb_dealloc_cmap(&fb_info.cmap);
+        fb_dealloc_cmap(&fb_info.cmap);
         chipfree();
         if (videomemory)
                 iounmap((void*)videomemory);
-        release_mem_region(CUSTOM_PHYSADDR+0xe0, 0x120);
         custom.dmacon = DMAF_ALL | DMAF_MASTER;
 }
 
@@ -3794,14 +3786,35 @@ static void ami_rebuild_copper(void)
         }
 }
 
-static void __exit amifb_exit(void)
+static int __exit amifb_remove(struct platform_device *pdev)
 {
         unregister_framebuffer(&fb_info);
-        amifb_deinit();
+        amifb_deinit(pdev);
         amifb_video_off();
+        return 0;
+}
+
+static struct platform_driver amifb_driver = {
+        .remove = __exit_p(amifb_remove),
+        .driver   = {
+                .name   = "amiga-video",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init amifb_init(void)
+{
+        return platform_driver_probe(&amifb_driver, amifb_probe);
 }
 
 module_init(amifb_init);
+
+static void __exit amifb_exit(void)
+{
+        platform_driver_unregister(&amifb_driver);
+}
+
 module_exit(amifb_exit);
 
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:amiga-video");
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 8d8dfda2f868..6df7c54db0a3 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -299,6 +299,7 @@ static const struct zorro_device_id cirrusfb_zorro_table[] = {
         },
         { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, cirrusfb_zorro_table);
 
 static const struct {
         zorro_id id2;
diff --git a/drivers/video/fm2fb.c b/drivers/video/fm2fb.c
index 6c91c61cdb63..1b0feb8e7244 100644
--- a/drivers/video/fm2fb.c
+++ b/drivers/video/fm2fb.c
@@ -219,6 +219,7 @@ static struct zorro_device_id fm2fb_devices[] __devinitdata = {
         { ZORRO_PROD_HELFRICH_RAINBOW_II },
         { 0 }
 };
+MODULE_DEVICE_TABLE(zorro, fm2fb_devices);
 
 static struct zorro_driver fm2fb_driver = {
         .name           = "fm2fb",
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index d47c47fc048f..3c7046d79654 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -97,7 +97,7 @@ static void zorro_seq_stop(struct seq_file *m, void *v)
 
 static int zorro_seq_show(struct seq_file *m, void *v)
 {
-        u_int slot = *(loff_t *)v;
+        unsigned int slot = *(loff_t *)v;
         struct zorro_dev *z = &zorro_autocon[slot];
 
         seq_printf(m, "%02x\t%08x\t%08lx\t%08lx\t%02x\n", slot, z->id,
@@ -129,7 +129,7 @@ static const struct file_operations zorro_devices_proc_fops = {
 
 static struct proc_dir_entry *proc_bus_zorro_dir;
 
-static int __init zorro_proc_attach_device(u_int slot)
+static int __init zorro_proc_attach_device(unsigned int slot)
 {
         struct proc_dir_entry *entry;
         char name[4];
@@ -146,7 +146,7 @@ static int __init zorro_proc_attach_device(u_int slot)
 
 static int __init zorro_proc_init(void)
 {
-        u_int slot;
+        unsigned int slot;
 
         if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) {
                 proc_bus_zorro_dir = proc_mkdir("bus/zorro", NULL);
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c
index 53180a37cc9a..7ee2b6e71786 100644
--- a/drivers/zorro/zorro-driver.c
+++ b/drivers/zorro/zorro-driver.c
@@ -137,10 +137,34 @@ static int zorro_bus_match(struct device *dev, struct device_driver *drv)
         return 0;
 }
 
+static int zorro_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+#ifdef CONFIG_HOTPLUG
+        struct zorro_dev *z;
+
+        if (!dev)
+                return -ENODEV;
+
+        z = to_zorro_dev(dev);
+        if (!z)
+                return -ENODEV;
+
+        if (add_uevent_var(env, "ZORRO_ID=%08X", z->id) ||
+            add_uevent_var(env, "ZORRO_SLOT_NAME=%s", dev_name(dev)) ||
+            add_uevent_var(env, "ZORRO_SLOT_ADDR=%04X", z->slotaddr) ||
+            add_uevent_var(env, "MODALIAS=" ZORRO_DEVICE_MODALIAS_FMT, z->id))
+                return -ENOMEM;
+
+        return 0;
+#else /* !CONFIG_HOTPLUG */
+        return -ENODEV;
+#endif /* !CONFIG_HOTPLUG */
+}
 
 struct bus_type zorro_bus_type = {
         .name   = "zorro",
         .match  = zorro_bus_match,
+        .uevent = zorro_uevent,
         .probe  = zorro_device_probe,
         .remove = zorro_device_remove,
 };
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c
index 1d2a772ea14c..eb924e0a64ce 100644
--- a/drivers/zorro/zorro-sysfs.c
+++ b/drivers/zorro/zorro-sysfs.c
@@ -77,6 +77,16 @@ static struct bin_attribute zorro_config_attr = {
         .read = zorro_read_config,
 };
 
+static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
+                             char *buf)
+{
+        struct zorro_dev *z = to_zorro_dev(dev);
+
+        return sprintf(buf, ZORRO_DEVICE_MODALIAS_FMT "\n", z->id);
+}
+
+static DEVICE_ATTR(modalias, S_IRUGO, modalias_show, NULL);
+
 int zorro_create_sysfs_dev_files(struct zorro_dev *z)
 {
         struct device *dev = &z->dev;
@@ -89,6 +99,7 @@ int zorro_create_sysfs_dev_files(struct zorro_dev *z)
             (error = device_create_file(dev, &dev_attr_slotaddr)) ||
             (error = device_create_file(dev, &dev_attr_slotsize)) ||
             (error = device_create_file(dev, &dev_attr_resource)) ||
+            (error = device_create_file(dev, &dev_attr_modalias)) ||
             (error = sysfs_create_bin_file(&dev->kobj, &zorro_config_attr)))
                 return error;
 
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index d45fb34e2d23..6455f3a244c5 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -15,6 +15,8 @@
 #include <linux/zorro.h>
 #include <linux/bitops.h>
 #include <linux/string.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
 
 #include <asm/setup.h>
 #include <asm/amigahw.h>
@@ -26,24 +28,17 @@
      *  Zorro Expansion Devices
      */
 
-u_int zorro_num_autocon = 0;
+unsigned int zorro_num_autocon;
 struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
 
 
     /*
-     *  Single Zorro bus
+     *  Zorro bus
      */
 
-struct zorro_bus zorro_bus = {\
-    .resources = {
-        /* Zorro II regions (on Zorro II/III) */
-        { .name = "Zorro II exp", .start = 0x00e80000, .end = 0x00efffff },
-        { .name = "Zorro II mem", .start = 0x00200000, .end = 0x009fffff },
-        /* Zorro III regions (on Zorro III only) */
-        { .name = "Zorro III exp", .start = 0xff000000, .end = 0xffffffff },
-        { .name = "Zorro III cfg", .start = 0x40000000, .end = 0x7fffffff }
-    },
-    .name = "Zorro bus"
+struct zorro_bus {
+        struct list_head devices;       /* list of devices on this bus */
+        struct device dev;
 };
 
 
@@ -53,18 +48,19 @@ struct zorro_bus zorro_bus = {\
 
 struct zorro_dev *zorro_find_device(zorro_id id, struct zorro_dev *from)
 {
-    struct zorro_dev *z;
+        struct zorro_dev *z;
 
-    if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
-        return NULL;
+        if (!zorro_num_autocon)
+                return NULL;
 
-    for (z = from ? from+1 : &zorro_autocon[0];
-         z < zorro_autocon+zorro_num_autocon;
-         z++)
-        if (id == ZORRO_WILDCARD || id == z->id)
-            return z;
-    return NULL;
+        for (z = from ? from+1 : &zorro_autocon[0];
+             z < zorro_autocon+zorro_num_autocon;
+             z++)
+                if (id == ZORRO_WILDCARD || id == z->id)
+                        return z;
+        return NULL;
 }
+EXPORT_SYMBOL(zorro_find_device);
 
 
     /*
@@ -83,121 +79,138 @@ struct zorro_dev *zorro_find_device(zorro_id id, struct zorro_dev *from)
      */
 
 DECLARE_BITMAP(zorro_unused_z2ram, 128);
+EXPORT_SYMBOL(zorro_unused_z2ram);
 
 
 static void __init mark_region(unsigned long start, unsigned long end,
                                int flag)
 {
-    if (flag)
-        start += Z2RAM_CHUNKMASK;
-    else
-        end += Z2RAM_CHUNKMASK;
-    start &= ~Z2RAM_CHUNKMASK;
-    end &= ~Z2RAM_CHUNKMASK;
-
-    if (end <= Z2RAM_START || start >= Z2RAM_END)
-        return;
-    start = start < Z2RAM_START ? 0x00000000 : start-Z2RAM_START;
-    end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START;
-    while (start < end) {
-        u32 chunk = start>>Z2RAM_CHUNKSHIFT;
         if (flag)
-            set_bit(chunk, zorro_unused_z2ram);
+                start += Z2RAM_CHUNKMASK;
         else
-            clear_bit(chunk, zorro_unused_z2ram);
-        start += Z2RAM_CHUNKSIZE;
-    }
+                end += Z2RAM_CHUNKMASK;
+        start &= ~Z2RAM_CHUNKMASK;
+        end &= ~Z2RAM_CHUNKMASK;
+
+        if (end <= Z2RAM_START || start >= Z2RAM_END)
+                return;
+        start = start < Z2RAM_START ? 0x00000000 : start-Z2RAM_START;
+        end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START;
+        while (start < end) {
+                u32 chunk = start>>Z2RAM_CHUNKSHIFT;
+                if (flag)
+                        set_bit(chunk, zorro_unused_z2ram);
+                else
+                        clear_bit(chunk, zorro_unused_z2ram);
+                start += Z2RAM_CHUNKSIZE;
+        }
 }
 
 
-static struct resource __init *zorro_find_parent_resource(struct zorro_dev *z)
+static struct resource __init *zorro_find_parent_resource(
+        struct platform_device *bridge, struct zorro_dev *z)
 {
-    int i;
+        int i;
 
-    for (i = 0; i < zorro_bus.num_resources; i++)
-        if (zorro_resource_start(z) >= zorro_bus.resources[i].start &&
-            zorro_resource_end(z) <= zorro_bus.resources[i].end)
-                return &zorro_bus.resources[i];
-    return &iomem_resource;
+        for (i = 0; i < bridge->num_resources; i++) {
+                struct resource *r = &bridge->resource[i];
+                if (zorro_resource_start(z) >= r->start &&
+                    zorro_resource_end(z) <= r->end)
+                        return r;
+        }
+        return &iomem_resource;
 }
 
 
-    /*
-     *  Initialization
-     */
 
-static int __init zorro_init(void)
+static int __init amiga_zorro_probe(struct platform_device *pdev)
 {
-    struct zorro_dev *z;
-    unsigned int i;
-    int error;
-
-    if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
-        return 0;
-
-    pr_info("Zorro: Probing AutoConfig expansion devices: %d device%s\n",
-           zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
-
-    /* Initialize the Zorro bus */
-    INIT_LIST_HEAD(&zorro_bus.devices);
-    dev_set_name(&zorro_bus.dev, "zorro");
-    error = device_register(&zorro_bus.dev);
-    if (error) {
-        pr_err("Zorro: Error registering zorro_bus\n");
-        return error;
-    }
-
-    /* Request the resources */
-    zorro_bus.num_resources = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;
-    for (i = 0; i < zorro_bus.num_resources; i++)
-        request_resource(&iomem_resource, &zorro_bus.resources[i]);
-
-    /* Register all devices */
-    for (i = 0; i < zorro_num_autocon; i++) {
-        z = &zorro_autocon[i];
-        z->id = (z->rom.er_Manufacturer<<16) | (z->rom.er_Product<<8);
-        if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
-            /* GVP quirk */
-            unsigned long magic = zorro_resource_start(z)+0x8000;
-            z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
-        }
-        sprintf(z->name, "Zorro device %08x", z->id);
-        zorro_name_device(z);
-        z->resource.name = z->name;
-        if (request_resource(zorro_find_parent_resource(z), &z->resource))
-            pr_err("Zorro: Address space collision on device %s %pR\n",
-                   z->name, &z->resource);
-        dev_set_name(&z->dev, "%02x", i);
-        z->dev.parent = &zorro_bus.dev;
-        z->dev.bus = &zorro_bus_type;
-        error = device_register(&z->dev);
+        struct zorro_bus *bus;
+        struct zorro_dev *z;
+        struct resource *r;
+        unsigned int i;
+        int error;
+
+        /* Initialize the Zorro bus */
+        bus = kzalloc(sizeof(*bus), GFP_KERNEL);
+        if (!bus)
+                return -ENOMEM;
+
+        INIT_LIST_HEAD(&bus->devices);
+        bus->dev.parent = &pdev->dev;
+        dev_set_name(&bus->dev, "zorro");
+        error = device_register(&bus->dev);
         if (error) {
-            pr_err("Zorro: Error registering device %s\n", z->name);
-            continue;
+                pr_err("Zorro: Error registering zorro_bus\n");
+                kfree(bus);
+                return error;
         }
-        error = zorro_create_sysfs_dev_files(z);
-        if (error)
-            dev_err(&z->dev, "Error creating sysfs files\n");
-    }
-
-    /* Mark all available Zorro II memory */
-    zorro_for_each_dev(z) {
-        if (z->rom.er_Type & ERTF_MEMLIST)
-            mark_region(zorro_resource_start(z), zorro_resource_end(z)+1, 1);
-    }
-
-    /* Unmark all used Zorro II memory */
-    for (i = 0; i < m68k_num_memory; i++)
-        if (m68k_memory[i].addr < 16*1024*1024)
-            mark_region(m68k_memory[i].addr,
-                        m68k_memory[i].addr+m68k_memory[i].size, 0);
-
-    return 0;
+        platform_set_drvdata(pdev, bus);
+
+        /* Register all devices */
+        pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n",
+                 zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
+
+        for (i = 0; i < zorro_num_autocon; i++) {
+                z = &zorro_autocon[i];
+                z->id = (z->rom.er_Manufacturer<<16) | (z->rom.er_Product<<8);
+                if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
+                        /* GVP quirk */
+                        unsigned long magic = zorro_resource_start(z)+0x8000;
+                        z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
+                }
+                sprintf(z->name, "Zorro device %08x", z->id);
+                zorro_name_device(z);
+                z->resource.name = z->name;
+                r = zorro_find_parent_resource(pdev, z);
+                error = request_resource(r, &z->resource);
+                if (error)
+                        dev_err(&bus->dev,
+                                "Address space collision on device %s %pR\n",
+                                z->name, &z->resource);
+                dev_set_name(&z->dev, "%02x", i);
+                z->dev.parent = &bus->dev;
+                z->dev.bus = &zorro_bus_type;
+                error = device_register(&z->dev);
+                if (error) {
+                        dev_err(&bus->dev, "Error registering device %s\n",
+                                z->name);
+                        continue;
+                }
+                error = zorro_create_sysfs_dev_files(z);
+                if (error)
+                        dev_err(&z->dev, "Error creating sysfs files\n");
+        }
+
+        /* Mark all available Zorro II memory */
+        zorro_for_each_dev(z) {
+                if (z->rom.er_Type & ERTF_MEMLIST)
+                        mark_region(zorro_resource_start(z),
+                                    zorro_resource_end(z)+1, 1);
+        }
+
+        /* Unmark all used Zorro II memory */
+        for (i = 0; i < m68k_num_memory; i++)
+                if (m68k_memory[i].addr < 16*1024*1024)
+                        mark_region(m68k_memory[i].addr,
+                                    m68k_memory[i].addr+m68k_memory[i].size,
+                                    0);
+
+        return 0;
 }
 
-subsys_initcall(zorro_init);
+static struct platform_driver amiga_zorro_driver = {
+        .driver   = {
+                .name   = "amiga-zorro",
+                .owner  = THIS_MODULE,
+        },
+};
 
-EXPORT_SYMBOL(zorro_find_device);
-EXPORT_SYMBOL(zorro_unused_z2ram);
+static int __init amiga_zorro_init(void)
+{
+        return platform_driver_probe(&amiga_zorro_driver, amiga_zorro_probe);
+}
+
+module_init(amiga_zorro_init);
 
 MODULE_LICENSE("GPL");