DM9000: Cleanups after the resource changes

Remove the now extraneous checks in dm9000_release_board()
now that the two-resource case is removed. Also remove the
check on pdev->num_resources, as we check the return data
from platform_get_resource() to ensure we have not only
the right number but the right type of resources as well.

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

diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 73270d93ae38fb13cedb7c33f25928fe788b02ad..79bdd9e29a01fe919d8783c4a5c9712a50a2f23f 100644 (file)
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -505,12 +505,6 @@ dm9000_poll_work(struct work_struct *w)
 static void
 dm9000_release_board(struct platform_device *pdev, struct board_info *db)
 {
-       if (db->data_res == NULL) {
-               if (db->addr_res != NULL)
-                       release_mem_region((unsigned long)db->io_addr, 4);
-               return;
-       }
-
        /* unmap our resources */
 
        iounmap(db->io_addr);
@@ -518,15 +512,11 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
 
        /* release the resources */
 
-       if (db->data_req != NULL) {
-               release_resource(db->data_req);
-               kfree(db->data_req);
-       }
+       release_resource(db->data_req);
+       kfree(db->data_req);
 
-       if (db->addr_req != NULL) {
-               release_resource(db->addr_req);
-               kfree(db->addr_req);
-       }
+       release_resource(db->addr_req);
+       kfree(db->addr_req);
 }
 
 static unsigned char dm9000_type_to_char(enum dm9000_type type)
@@ -580,12 +570,6 @@ dm9000_probe(struct platform_device *pdev)
 
        INIT_DELAYED_WORK(&db->phy_poll, dm9000_poll_work);
 
-
-       if (pdev->num_resources < 3) {
-               ret = -ENODEV;
-               goto out;
-       }
-
        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);