1 files changed, 44 insertions, 80 deletions

diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
index 5c8da466148..496223e9e2f 100644
--- a/drivers/net/can/sja1000/sja1000_isa.c
+++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -17,7 +17,7 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
-#include <linux/platform_device.h>
+#include <linux/isa.h>
 #include <linux/interrupt.h>
 #include <linux/netdevice.h>
 #include <linux/delay.h>
@@ -42,11 +42,11 @@ MODULE_LICENSE("GPL v2");
 
 static unsigned long port[MAXDEV];
 static unsigned long mem[MAXDEV];
-static int irq[MAXDEV];
-static int clk[MAXDEV];
-static unsigned char cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
-static unsigned char ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = 0xff};
-static int indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
+static int __devinitdata irq[MAXDEV];
+static int __devinitdata clk[MAXDEV];
+static char __devinitdata cdr[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
+static char __devinitdata ocr[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
+static char __devinitdata indirect[MAXDEV] = {[0 ... (MAXDEV - 1)] = -1};
 
 module_param_array(port, ulong, NULL, S_IRUGO);
 MODULE_PARM_DESC(port, "I/O port number");
@@ -54,7 +54,7 @@ MODULE_PARM_DESC(port, "I/O port number");
 module_param_array(mem, ulong, NULL, S_IRUGO);
 MODULE_PARM_DESC(mem, "I/O memory address");
 
-module_param_array(indirect, int, NULL, S_IRUGO);
+module_param_array(indirect, byte, NULL, S_IRUGO);
 MODULE_PARM_DESC(indirect, "Indirect access via address and data port");
 
 module_param_array(irq, int, NULL, S_IRUGO);
@@ -75,8 +75,6 @@ MODULE_PARM_DESC(ocr, "Output control register "
 #define SJA1000_IOSIZE          0x20
 #define SJA1000_IOSIZE_INDIRECT 0x02
 
-static struct platform_device *sja1000_isa_devs[MAXDEV];
-
 static u8 sja1000_isa_mem_read_reg(const struct sja1000_priv *priv, int reg)
 {
         return readb(priv->reg_base + reg);
@@ -117,18 +115,26 @@ static void sja1000_isa_port_write_reg_indirect(const struct sja1000_priv *priv,
         outb(val, base + 1);
 }
 
-static int sja1000_isa_probe(struct platform_device *pdev)
+static int __devinit sja1000_isa_match(struct device *pdev, unsigned int idx)
+{
+        if (port[idx] || mem[idx]) {
+                if (irq[idx])
+                        return 1;
+        } else if (idx)
+                return 0;
+
+        dev_err(pdev, "insufficient parameters supplied\n");
+        return 0;
+}
+
+static int __devinit sja1000_isa_probe(struct device *pdev, unsigned int idx)
 {
         struct net_device *dev;
         struct sja1000_priv *priv;
         void __iomem *base = NULL;
         int iosize = SJA1000_IOSIZE;
-        int idx = pdev->id;
         int err;
 
-        dev_dbg(&pdev->dev, "probing idx=%d: port=%#lx, mem=%#lx, irq=%d\n",
-                idx, port[idx], mem[idx], irq[idx]);
-
         if (mem[idx]) {
                 if (!request_mem_region(mem[idx], iosize, DRV_NAME)) {
                         err = -EBUSY;
@@ -183,31 +189,31 @@ static int sja1000_isa_probe(struct platform_device *pdev)
         else
                 priv->can.clock.freq = CLK_DEFAULT / 2;
 
-        if (ocr[idx] != 0xff)
-                priv->ocr = ocr[idx];
-        else if (ocr[0] != 0xff)
-                priv->ocr = ocr[0];
+        if (ocr[idx] != -1)
+                priv->ocr = ocr[idx] & 0xff;
+        else if (ocr[0] != -1)
+                priv->ocr = ocr[0] & 0xff;
         else
                 priv->ocr = OCR_DEFAULT;
 
-        if (cdr[idx] != 0xff)
-                priv->cdr = cdr[idx];
-        else if (cdr[0] != 0xff)
-                priv->cdr = cdr[0];
+        if (cdr[idx] != -1)
+                priv->cdr = cdr[idx] & 0xff;
+        else if (cdr[0] != -1)
+                priv->cdr = cdr[0] & 0xff;
         else
                 priv->cdr = CDR_DEFAULT;
 
-        dev_set_drvdata(&pdev->dev, dev);
-        SET_NETDEV_DEV(dev, &pdev->dev);
+        dev_set_drvdata(pdev, dev);
+        SET_NETDEV_DEV(dev, pdev);
 
         err = register_sja1000dev(dev);
         if (err) {
-                dev_err(&pdev->dev, "registering %s failed (err=%d)\n",
+                dev_err(pdev, "registering %s failed (err=%d)\n",
                         DRV_NAME, err);
                 goto exit_unmap;
         }
 
-        dev_info(&pdev->dev, "%s device registered (reg_base=0x%p, irq=%d)\n",
+        dev_info(pdev, "%s device registered (reg_base=0x%p, irq=%d)\n",
                  DRV_NAME, priv->reg_base, dev->irq);
         return 0;
 
@@ -223,14 +229,13 @@ static int sja1000_isa_probe(struct platform_device *pdev)
         return err;
 }
 
-static int sja1000_isa_remove(struct platform_device *pdev)
+static int __devexit sja1000_isa_remove(struct device *pdev, unsigned int idx)
 {
-        struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct net_device *dev = dev_get_drvdata(pdev);
         struct sja1000_priv *priv = netdev_priv(dev);
-        int idx = pdev->id;
 
         unregister_sja1000dev(dev);
-        dev_set_drvdata(&pdev->dev, NULL);
+        dev_set_drvdata(pdev, NULL);
 
         if (mem[idx]) {
                 iounmap(priv->reg_base);
@@ -246,70 +251,29 @@ static int sja1000_isa_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct platform_driver sja1000_isa_driver = {
+static struct isa_driver sja1000_isa_driver = {
+        .match = sja1000_isa_match,
         .probe = sja1000_isa_probe,
-        .remove = sja1000_isa_remove,
+        .remove = __devexit_p(sja1000_isa_remove),
         .driver = {
                 .name = DRV_NAME,
-                .owner = THIS_MODULE,
         },
 };
 
 static int __init sja1000_isa_init(void)
 {
-        int idx, err;
-
-        for (idx = 0; idx < MAXDEV; idx++) {
-                if ((port[idx] || mem[idx]) && irq[idx]) {
-                        sja1000_isa_devs[idx] =
-                                platform_device_alloc(DRV_NAME, idx);
-                        if (!sja1000_isa_devs[idx]) {
-                                err = -ENOMEM;
-                                goto exit_free_devices;
-                        }
-                        err = platform_device_add(sja1000_isa_devs[idx]);
-                        if (err) {
-                                platform_device_put(sja1000_isa_devs[idx]);
-                                goto exit_free_devices;
-                        }
-                        pr_debug("%s: platform device %d: port=%#lx, mem=%#lx, "
-                                 "irq=%d\n",
-                                 DRV_NAME, idx, port[idx], mem[idx], irq[idx]);
-                } else if (idx == 0 || port[idx] || mem[idx]) {
-                                pr_err("%s: insufficient parameters supplied\n",
-                                       DRV_NAME);
-                                err = -EINVAL;
-                                goto exit_free_devices;
-                }
-        }
-
-        err = platform_driver_register(&sja1000_isa_driver);
-        if (err)
-                goto exit_free_devices;
-
-        pr_info("Legacy %s driver for max. %d devices registered\n",
-                DRV_NAME, MAXDEV);
-
-        return 0;
-
-exit_free_devices:
-        while (--idx >= 0) {
-                if (sja1000_isa_devs[idx])
-                        platform_device_unregister(sja1000_isa_devs[idx]);
-        }
+        int err = isa_register_driver(&sja1000_isa_driver, MAXDEV);
 
+        if (!err)
+                printk(KERN_INFO
+                       "Legacy %s driver for max. %d devices registered\n",
+                       DRV_NAME, MAXDEV);
         return err;
 }
 
 static void __exit sja1000_isa_exit(void)
 {
-        int idx;
-
-        platform_driver_unregister(&sja1000_isa_driver);
-        for (idx = 0; idx < MAXDEV; idx++) {
-                if (sja1000_isa_devs[idx])
-                        platform_device_unregister(sja1000_isa_devs[idx]);
-        }
+        isa_unregister_driver(&sja1000_isa_driver);
 }
 
 module_init(sja1000_isa_init);