Skip to content

Commit

Permalink
i2c: Use resource_size
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: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Julia Lawall authored and Ben Dooks committed Jul 14, 2009
1 parent 7605fa3 commit 5933082
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions drivers/i2c/busses/i2c-davinci.c
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
return -ENODEV;
}

ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
ioarea = request_mem_region(mem->start, resource_size(mem),
pdev->name);
if (!ioarea) {
dev_err(&pdev->dev, "I2C region already claimed\n");
Expand Down Expand Up @@ -578,7 +578,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
put_device(&pdev->dev);
kfree(dev);
err_release_region:
release_mem_region(mem->start, (mem->end - mem->start) + 1);
release_mem_region(mem->start, resource_size(mem));

return r;
}
Expand All @@ -601,7 +601,7 @@ static int davinci_i2c_remove(struct platform_device *pdev)
kfree(dev);

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(mem->start, (mem->end - mem->start) + 1);
release_mem_region(mem->start, resource_size(mem));
return 0;
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/i2c/busses/i2c-omap.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ omap_i2c_probe(struct platform_device *pdev)
return -ENODEV;
}

ioarea = request_mem_region(mem->start, (mem->end - mem->start) + 1,
ioarea = request_mem_region(mem->start, resource_size(mem),
pdev->name);
if (!ioarea) {
dev_err(&pdev->dev, "I2C region already claimed\n");
Expand Down Expand Up @@ -905,7 +905,7 @@ omap_i2c_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL);
kfree(dev);
err_release_region:
release_mem_region(mem->start, (mem->end - mem->start) + 1);
release_mem_region(mem->start, resource_size(mem));

return r;
}
Expand All @@ -925,7 +925,7 @@ omap_i2c_remove(struct platform_device *pdev)
iounmap(dev->base);
kfree(dev);
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(mem->start, (mem->end - mem->start) + 1);
release_mem_region(mem->start, resource_size(mem));
return 0;
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-sh_mobile.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
goto err_irq;
}

size = (res->end - res->start) + 1;
size = resource_size(res);

pd->reg = ioremap(res->start, size);
if (pd->reg == NULL) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/i2c/busses/i2c-simtec.c
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ static int simtec_i2c_probe(struct platform_device *dev)
goto err;
}

size = (res->end-res->start)+1;
size = resource_size(res);

pd->ioarea = request_mem_region(res->start, size, dev->name);
if (pd->ioarea == NULL) {
Expand Down

0 comments on commit 5933082

Please sign in to comment.