|
@@ -1685,7 +1685,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
|
|
|
}
|
|
|
pr_info("done!\n");
|
|
|
|
|
|
- if (!request_mem_region(res->start, (res->end - res->start),
|
|
|
+ if (!request_mem_region(res->start, resource_size(res),
|
|
|
pdev->name)) {
|
|
|
pr_err("%s: ERROR: memory allocation failed"
|
|
|
"cannot get the I/O addr 0x%x\n",
|
|
@@ -1694,9 +1694,9 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
|
- addr = ioremap(res->start, (res->end - res->start));
|
|
|
+ addr = ioremap(res->start, resource_size(res));
|
|
|
if (!addr) {
|
|
|
- pr_err("%s: ERROR: memory mapping failed \n", __func__);
|
|
|
+ pr_err("%s: ERROR: memory mapping failed\n", __func__);
|
|
|
ret = -ENOMEM;
|
|
|
goto out;
|
|
|
}
|
|
@@ -1774,7 +1774,7 @@ static int stmmac_dvr_probe(struct platform_device *pdev)
|
|
|
out:
|
|
|
if (ret < 0) {
|
|
|
platform_set_drvdata(pdev, NULL);
|
|
|
- release_mem_region(res->start, (res->end - res->start));
|
|
|
+ release_mem_region(res->start, resource_size(res));
|
|
|
if (addr != NULL)
|
|
|
iounmap(addr);
|
|
|
}
|
|
@@ -1812,7 +1812,7 @@ static int stmmac_dvr_remove(struct platform_device *pdev)
|
|
|
|
|
|
iounmap((void *)ndev->base_addr);
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- release_mem_region(res->start, (res->end - res->start));
|
|
|
+ release_mem_region(res->start, resource_size(res));
|
|
|
|
|
|
free_netdev(ndev);
|
|
|
|