Skip to content

Commit

Permalink
edac: fix resource size calculation
Browse files Browse the repository at this point in the history 
Use the function resource_size, which reduces the chance of introducing
off-by-one errors in calculating the resource size.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
struct resource *res;
@@

- (res->end - res->start) + 1
+ resource_size(res)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Doug Thompson <dougthompson@xmission.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Julia Lawall authored and Linus Torvalds committed Sep 24, 2009
1 parent b484625 commit 30a61ff
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions drivers/edac/cpc925_edac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,14 +885,14 @@ static int __devinit cpc925_probe(struct platform_device *pdev)

if (!devm_request_mem_region(&pdev->dev,
r->start,
r->end - r->start + 1,
resource_size(r),
pdev->name)) {
cpc925_printk(KERN_ERR, "Unable to request mem region\n");
res = -EBUSY;
goto err1;
}

vbase = devm_ioremap(&pdev->dev, r->start, r->end - r->start + 1);
vbase = devm_ioremap(&pdev->dev, r->start, resource_size(r));
if (!vbase) {
cpc925_printk(KERN_ERR, "Unable to ioremap device\n");
res = -ENOMEM;
Expand Down Expand Up @@ -953,7 +953,7 @@ static int __devinit cpc925_probe(struct platform_device *pdev)
cpc925_mc_exit(mci);
edac_mc_free(mci);
err2:
devm_release_mem_region(&pdev->dev, r->start, r->end-r->start+1);
devm_release_mem_region(&pdev->dev, r->start, resource_size(r));
err1:
devres_release_group(&pdev->dev, cpc925_probe);
out:
Expand Down
22 changes: 11 additions & 11 deletions drivers/edac/mv64x60_edac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static int __init mv64x60_pci_fixup(struct platform_device *pdev)
return -ENOENT;
}

pci_serr = ioremap(r->start, r->end - r->start + 1);
pci_serr = ioremap(r->start, resource_size(r));
if (!pci_serr)
return -ENOMEM;

Expand Down Expand Up @@ -140,7 +140,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)

if (!devm_request_mem_region(&pdev->dev,
r->start,
r->end - r->start + 1,
resource_size(r),
pdata->name)) {
printk(KERN_ERR "%s: Error while requesting mem region\n",
__func__);
Expand All @@ -150,7 +150,7 @@ static int __devinit mv64x60_pci_err_probe(struct platform_device *pdev)

pdata->pci_vbase = devm_ioremap(&pdev->dev,
r->start,
r->end - r->start + 1);
resource_size(r));
if (!pdata->pci_vbase) {
printk(KERN_ERR "%s: Unable to setup PCI err regs\n", __func__);
res = -ENOMEM;
Expand Down Expand Up @@ -306,7 +306,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)

if (!devm_request_mem_region(&pdev->dev,
r->start,
r->end - r->start + 1,
resource_size(r),
pdata->name)) {
printk(KERN_ERR "%s: Error while request mem region\n",
__func__);
Expand All @@ -316,7 +316,7 @@ static int __devinit mv64x60_sram_err_probe(struct platform_device *pdev)

pdata->sram_vbase = devm_ioremap(&pdev->dev,
r->start,
r->end - r->start + 1);
resource_size(r));
if (!pdata->sram_vbase) {
printk(KERN_ERR "%s: Unable to setup SRAM err regs\n",
__func__);
Expand Down Expand Up @@ -474,7 +474,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)

if (!devm_request_mem_region(&pdev->dev,
r->start,
r->end - r->start + 1,
resource_size(r),
pdata->name)) {
printk(KERN_ERR "%s: Error while requesting mem region\n",
__func__);
Expand All @@ -484,7 +484,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)

pdata->cpu_vbase[0] = devm_ioremap(&pdev->dev,
r->start,
r->end - r->start + 1);
resource_size(r));
if (!pdata->cpu_vbase[0]) {
printk(KERN_ERR "%s: Unable to setup CPU err regs\n", __func__);
res = -ENOMEM;
Expand All @@ -501,7 +501,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)

if (!devm_request_mem_region(&pdev->dev,
r->start,
r->end - r->start + 1,
resource_size(r),
pdata->name)) {
printk(KERN_ERR "%s: Error while requesting mem region\n",
__func__);
Expand All @@ -511,7 +511,7 @@ static int __devinit mv64x60_cpu_err_probe(struct platform_device *pdev)

pdata->cpu_vbase[1] = devm_ioremap(&pdev->dev,
r->start,
r->end - r->start + 1);
resource_size(r));
if (!pdata->cpu_vbase[1]) {
printk(KERN_ERR "%s: Unable to setup CPU err regs\n", __func__);
res = -ENOMEM;
Expand Down Expand Up @@ -726,7 +726,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)

if (!devm_request_mem_region(&pdev->dev,
r->start,
r->end - r->start + 1,
resource_size(r),
pdata->name)) {
printk(KERN_ERR "%s: Error while requesting mem region\n",
__func__);
Expand All @@ -736,7 +736,7 @@ static int __devinit mv64x60_mc_err_probe(struct platform_device *pdev)

pdata->mc_vbase = devm_ioremap(&pdev->dev,
r->start,
r->end - r->start + 1);
resource_size(r));
if (!pdata->mc_vbase) {
printk(KERN_ERR "%s: Unable to setup MC err regs\n", __func__);
res = -ENOMEM;
Expand Down

0 comments on commit 30a61ff

Please sign in to comment.