Skip to content

Commit

Permalink
drivers/ata: 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>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
  • Loading branch information
Julia Lawall authored and Jeff Garzik committed Sep 11, 2009
1 parent f90f613 commit 041b5ea
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/ata/pata_octeon_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -841,7 +841,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)
ocd = pdev->dev.platform_data;

cs0 = devm_ioremap_nocache(&pdev->dev, res_cs0->start,
res_cs0->end - res_cs0->start + 1);
resource_size(res_cs0));

if (!cs0)
return -ENOMEM;
Expand Down
8 changes: 4 additions & 4 deletions drivers/ata/pata_platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ int __devinit __pata_platform_probe(struct device *dev,
*/
if (mmio) {
ap->ioaddr.cmd_addr = devm_ioremap(dev, io_res->start,
io_res->end - io_res->start + 1);
resource_size(io_res));
ap->ioaddr.ctl_addr = devm_ioremap(dev, ctl_res->start,
ctl_res->end - ctl_res->start + 1);
resource_size(ctl_res));
} else {
ap->ioaddr.cmd_addr = devm_ioport_map(dev, io_res->start,
io_res->end - io_res->start + 1);
resource_size(io_res));
ap->ioaddr.ctl_addr = devm_ioport_map(dev, ctl_res->start,
ctl_res->end - ctl_res->start + 1);
resource_size(ctl_res));
}
if (!ap->ioaddr.cmd_addr || !ap->ioaddr.ctl_addr) {
dev_err(dev, "failed to map IO/CTL base\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/pata_rb532_cf.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ static __devinit int rb532_pata_driver_probe(struct platform_device *pdev)
info->irq = irq;

info->iobase = devm_ioremap_nocache(&pdev->dev, res->start,
res->end - res->start + 1);
resource_size(res));
if (!info->iobase)
return -ENOMEM;

Expand Down
2 changes: 1 addition & 1 deletion drivers/ata/sata_mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -4013,7 +4013,7 @@ static int mv_platform_probe(struct platform_device *pdev)

host->iomap = NULL;
hpriv->base = devm_ioremap(&pdev->dev, res->start,
res->end - res->start + 1);
resource_size(res));
hpriv->base -= SATAHC0_REG_BASE;

/*
Expand Down

0 comments on commit 041b5ea

Please sign in to comment.