2 files changed, 18 insertions, 21 deletions

diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index cad55bc087df..e6666a30f24b 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -44,10 +44,6 @@
 #include <asm/mac_oss.h>
 #include <asm/mac_psc.h>
 
-/* platform device info */
-
-#define SWIM_IO_SIZE 0x2000     /* SWIM IO resource size */
-
 /* Mac bootinfo struct */
 struct mac_booter_data mac_bi_data;
 
@@ -862,23 +858,23 @@ static void mac_get_model(char *str)
         strcat(str, macintosh_config->name);
 }
 
-static struct resource swim_resources[1];
+static struct resource swim_rsrc = { .flags = IORESOURCE_MEM };
 
-static struct platform_device swim_device = {
+static struct platform_device swim_pdev = {
         .name           = "swim",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(swim_resources),
-        .resource       = swim_resources,
-};
-
-static struct platform_device *mac_platform_devices[] __initdata = {
-        &swim_device
+        .num_resources  = 1,
+        .resource       = &swim_rsrc,
 };
 
 int __init mac_platform_init(void)
 {
         u8 *swim_base;
 
+        /*
+         * Floppy device
+         */
+
         switch (macintosh_config->floppy_type) {
         case MAC_FLOPPY_SWIM_ADDR1:
                 swim_base = (u8 *)(VIA1_BASE + 0x1E000);
@@ -887,16 +883,17 @@ int __init mac_platform_init(void)
                 swim_base = (u8 *)(VIA1_BASE + 0x16000);
                 break;
         default:
-                return 0;
+                swim_base = NULL;
+                break;
         }
 
-        swim_resources[0].name = "swim-regs";
-        swim_resources[0].start = (resource_size_t)swim_base;
-        swim_resources[0].end = (resource_size_t)(swim_base + SWIM_IO_SIZE);
-        swim_resources[0].flags = IORESOURCE_MEM;
+        if (swim_base) {
+                swim_rsrc.start = (resource_size_t) swim_base,
+                swim_rsrc.end   = (resource_size_t) swim_base + 0x2000,
+                platform_device_register(&swim_pdev);
+        }
 
-        return platform_add_devices(mac_platform_devices,
-                                    ARRAY_SIZE(mac_platform_devices));
+        return 0;
 }
 
 arch_initcall(mac_platform_init);
diff --git a/drivers/block/swim.c b/drivers/block/swim.c
index 8f569e3df890..821c2833f9cf 100644
--- a/drivers/block/swim.c
+++ b/drivers/block/swim.c
@@ -864,7 +864,7 @@ static int __devinit swim_probe(struct platform_device *dev)
         struct swim_priv *swd;
         int ret;
 
-        res = platform_get_resource_byname(dev, IORESOURCE_MEM, "swim-regs");
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (!res) {
                 ret = -ENODEV;
                 goto out;
@@ -942,7 +942,7 @@ static int __devexit swim_remove(struct platform_device *dev)
 
         iounmap(swd->base);
 
-        res = platform_get_resource_byname(dev, IORESOURCE_MEM, "swim-regs");
+        res = platform_get_resource(dev, IORESOURCE_MEM, 0);
         if (res)
                 release_mem_region(res->start, resource_size(res));