| 1 | From dbd9b51204aa4114756b8659e180139ef3878032 Mon Sep 17 00:00:00 2001 |
| 2 | From: Maxime Bizon <mbizon@freebox.fr> |
| 3 | Date: Thu, 21 Jan 2010 17:28:36 +0100 |
| 4 | Subject: [PATCH 28/63] bcm63xx_enet: use resource_size(). |
| 5 | |
| 6 | --- |
| 7 | drivers/net/ethernet/broadcom/bcm63xx_enet.c | 18 ++++++++---------- |
| 8 | 1 files changed, 8 insertions(+), 10 deletions(-) |
| 9 | |
| 10 | --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| 11 | +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c |
| 12 | @@ -1594,7 +1594,6 @@ static int __devinit bcm_enet_probe(stru |
| 13 | struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; |
| 14 | struct mii_bus *bus; |
| 15 | const char *clk_name; |
| 16 | - unsigned int iomem_size; |
| 17 | int i, ret; |
| 18 | |
| 19 | /* stop if shared driver failed, assume driver->probe will be |
| 20 | @@ -1619,13 +1618,13 @@ static int __devinit bcm_enet_probe(stru |
| 21 | if (ret) |
| 22 | goto out; |
| 23 | |
| 24 | - iomem_size = resource_size(res_mem); |
| 25 | - if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) { |
| 26 | + if (!request_mem_region(res_mem->start, resource_size(res_mem), |
| 27 | + "bcm63xx_enet")) { |
| 28 | ret = -EBUSY; |
| 29 | goto out; |
| 30 | } |
| 31 | |
| 32 | - priv->base = ioremap(res_mem->start, iomem_size); |
| 33 | + priv->base = ioremap(res_mem->start, resource_size(res_mem)); |
| 34 | if (priv->base == NULL) { |
| 35 | ret = -ENOMEM; |
| 36 | goto out_release_mem; |
| 37 | @@ -1831,7 +1830,7 @@ out_unmap: |
| 38 | iounmap(priv->base); |
| 39 | |
| 40 | out_release_mem: |
| 41 | - release_mem_region(res_mem->start, iomem_size); |
| 42 | + release_mem_region(res_mem->start, resource_size(res_mem)); |
| 43 | out: |
| 44 | free_netdev(dev); |
| 45 | return ret; |
| 46 | @@ -1903,19 +1902,18 @@ struct platform_driver bcm63xx_enet_driv |
| 47 | static int __devinit bcm_enet_shared_probe(struct platform_device *pdev) |
| 48 | { |
| 49 | struct resource *res; |
| 50 | - unsigned int iomem_size; |
| 51 | |
| 52 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 53 | if (!res) |
| 54 | return -ENODEV; |
| 55 | |
| 56 | - iomem_size = resource_size(res); |
| 57 | - if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma")) |
| 58 | + if (!request_mem_region(res->start, resource_size(res), |
| 59 | + "bcm63xx_enet_dma")) |
| 60 | return -EBUSY; |
| 61 | |
| 62 | - bcm_enet_shared_base = ioremap(res->start, iomem_size); |
| 63 | + bcm_enet_shared_base = ioremap(res->start, resource_size(res)); |
| 64 | if (!bcm_enet_shared_base) { |
| 65 | - release_mem_region(res->start, iomem_size); |
| 66 | + release_mem_region(res->start, resource_size(res)); |
| 67 | return -ENOMEM; |
| 68 | } |
| 69 | return 0; |
| 70 | |
