Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
[linux-2.6.git] / drivers / net / bcm63xx_enet.c
index 4753bb9..1d9b985 100644 (file)
@@ -1647,7 +1647,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
        if (ret)
                goto out;
 
-       iomem_size = res_mem->end - res_mem->start + 1;
+       iomem_size = resource_size(res_mem);
        if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
                ret = -EBUSY;
                goto out;
@@ -1862,7 +1862,7 @@ static int __devexit bcm_enet_remove(struct platform_device *pdev)
        /* release device resources */
        iounmap(priv->base);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(res->start, res->end - res->start + 1);
+       release_mem_region(res->start, resource_size(res));
 
        /* disable hw block clocks */
        if (priv->phy_clk) {
@@ -1898,7 +1898,7 @@ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
        if (!res)
                return -ENODEV;
 
-       iomem_size = res->end - res->start + 1;
+       iomem_size = resource_size(res);
        if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma"))
                return -EBUSY;
 
@@ -1916,7 +1916,7 @@ static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
 
        iounmap(bcm_enet_shared_base);
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(res->start, res->end - res->start + 1);
+       release_mem_region(res->start, resource_size(res));
        return 0;
 }