DM9000: Remove the 2 resources probe scheme.

The dm9000 driver accepts either 2 or 3 resources to describe the platform
devices. The 2 resources case abuses the ioresource mechanism by passing
ioremap()ed memory through the platform device resources. This patch removes
that case and converts boards that were using it to the 3 resources scheme.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Laurent Pinchart <laurentp@cse-semaphore.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 08a7365a7d1051268c0b9b63cd3e410119a55d26..b6d4b8e1d9e2799af59e34461731e54001ecdb65 100644 (file)
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -528,7 +528,6 @@ dm9000_probe(struct platform_device *pdev)
        struct board_info *db;  /* Point a board information structure */
        struct net_device *ndev;
        const unsigned char *mac_src;
-       unsigned long base;
        int ret = 0;
        int iosize;
        int i;
@@ -558,81 +557,64 @@ dm9000_probe(struct platform_device *pdev)
        INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work);
 
 
-       if (pdev->num_resources < 2) {
+       if (pdev->num_resources < 3) {
                ret = -ENODEV;
                goto out;
-       } else if (pdev->num_resources == 2) {
-               base = pdev->resource[0].start;
-
-               if (!request_mem_region(base, 4, ndev->name)) {
-                       ret = -EBUSY;
-                       goto out;
-               }
-
-               ndev->base_addr = base;
-               ndev->irq = pdev->resource[1].start;
-               db->io_addr = (void __iomem *)base;
-               db->io_data = (void __iomem *)(base + 4);
+       }
 
-               /* ensure at least we have a default set of IO routines */
-               dm9000_set_io(db, 2);
+       db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+       db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
 
-       } else {
-               db->addr_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-               db->data_res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-               db->irq_res  = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-
-               if (db->addr_res == NULL || db->data_res == NULL ||
-                   db->irq_res == NULL) {
-                       dev_err(db->dev, "insufficient resources\n");
-                       ret = -ENOENT;
-                       goto out;
-               }
+       if (db->addr_res == NULL || db->data_res == NULL ||
+           db->irq_res == NULL) {
+               dev_err(db->dev, "insufficient resources\n");
+               ret = -ENOENT;
+               goto out;
+       }
 
-               i = res_size(db->addr_res);
-               db->addr_req = request_mem_region(db->addr_res->start, i,
-                                                 pdev->name);
+       iosize = res_size(db->addr_res);
+       db->addr_req = request_mem_region(db->addr_res->start, iosize,
+                                         pdev->name);
 
-               if (db->addr_req == NULL) {
-                       dev_err(db->dev, "cannot claim address reg area\n");
-                       ret = -EIO;
-                       goto out;
-               }
-
-               db->io_addr = ioremap(db->addr_res->start, i);
+       if (db->addr_req == NULL) {
+               dev_err(db->dev, "cannot claim address reg area\n");
+               ret = -EIO;
+               goto out;
+       }
 
-               if (db->io_addr == NULL) {
-                       dev_err(db->dev, "failed to ioremap address reg\n");
-                       ret = -EINVAL;
-                       goto out;
-               }
+       db->io_addr = ioremap(db->addr_res->start, iosize);
 
-               iosize = res_size(db->data_res);
-               db->data_req = request_mem_region(db->data_res->start, iosize,
-                                                 pdev->name);
+       if (db->io_addr == NULL) {
+               dev_err(db->dev, "failed to ioremap address reg\n");
+               ret = -EINVAL;
+               goto out;
+       }
 
-               if (db->data_req == NULL) {
-                       dev_err(db->dev, "cannot claim data reg area\n");
-                       ret = -EIO;
-                       goto out;
-               }
+       iosize = res_size(db->data_res);
+       db->data_req = request_mem_region(db->data_res->start, iosize,
+                                         pdev->name);
 
-               db->io_data = ioremap(db->data_res->start, iosize);
+       if (db->data_req == NULL) {
+               dev_err(db->dev, "cannot claim data reg area\n");
+               ret = -EIO;
+               goto out;
+       }
 
-               if (db->io_data == NULL) {
-                       dev_err(db->dev,"failed to ioremap data reg\n");
-                       ret = -EINVAL;
-                       goto out;
-               }
+       db->io_data = ioremap(db->data_res->start, iosize);
 
-               /* fill in parameters for net-dev structure */
+       if (db->io_data == NULL) {
+               dev_err(db->dev, "failed to ioremap data reg\n");
+               ret = -EINVAL;
+               goto out;
+       }
 
-               ndev->base_addr = (unsigned long)db->io_addr;
-               ndev->irq       = db->irq_res->start;
+       /* fill in parameters for net-dev structure */
+       ndev->base_addr = (unsigned long)db->io_addr;
+       ndev->irq       = db->irq_res->start;
 
-               /* ensure at least we have a default set of IO routines */
-               dm9000_set_io(db, iosize);
-       }
+       /* ensure at least we have a default set of IO routines */
+       dm9000_set_io(db, iosize);
 
        /* check to see if anything is being over-ridden */
        if (pdata != NULL) {