forked from Minki/linux
drivers/ata: use resource_size
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>
This commit is contained in:
parent
f90f613c3e
commit
041b5eac25
@ -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;
|
||||
|
@ -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");
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user