treewide: Fix iomap resource size miscalculations
Convert off-by-1 r->end - r->start to resource_size(r) Signed-off-by: Joe Perches <joe@perches.com> Acked-by: David Brown <davidb@codeaurora.org> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Florian Fainelli <florian@openwrt.org> Acked-by: Wim Van Sebroeck <wim@iguana.be> Acked-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
parent
b0c3af5ef0
commit
06794eaeb7
|
@ -416,8 +416,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv)
|
||||||
dev_dbg(&(mbox->pdev->dev),
|
dev_dbg(&(mbox->pdev->dev),
|
||||||
"Resource name: %s start: 0x%X, end: 0x%X\n",
|
"Resource name: %s start: 0x%X, end: 0x%X\n",
|
||||||
resource->name, resource->start, resource->end);
|
resource->name, resource->start, resource->end);
|
||||||
mbox->virtbase_peer =
|
mbox->virtbase_peer = ioremap(resource->start, resource_size(resource));
|
||||||
ioremap(resource->start, resource->end - resource->start);
|
|
||||||
if (!mbox->virtbase_peer) {
|
if (!mbox->virtbase_peer) {
|
||||||
dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n");
|
dev_err(&(mbox->pdev->dev), "Unable to ioremap peer mbox\n");
|
||||||
mbox = NULL;
|
mbox = NULL;
|
||||||
|
@ -440,8 +439,7 @@ struct mbox *mbox_setup(u8 mbox_id, mbox_recv_cb_t *mbox_cb, void *priv)
|
||||||
dev_dbg(&(mbox->pdev->dev),
|
dev_dbg(&(mbox->pdev->dev),
|
||||||
"Resource name: %s start: 0x%X, end: 0x%X\n",
|
"Resource name: %s start: 0x%X, end: 0x%X\n",
|
||||||
resource->name, resource->start, resource->end);
|
resource->name, resource->start, resource->end);
|
||||||
mbox->virtbase_local =
|
mbox->virtbase_local = ioremap(resource->start, resource_size(resource));
|
||||||
ioremap(resource->start, resource->end - resource->start);
|
|
||||||
if (!mbox->virtbase_local) {
|
if (!mbox->virtbase_local) {
|
||||||
dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n");
|
dev_err(&(mbox->pdev->dev), "Unable to ioremap local mbox\n");
|
||||||
mbox = NULL;
|
mbox = NULL;
|
||||||
|
|
|
@ -185,7 +185,7 @@ int __init rb532_gpio_init(void)
|
||||||
struct resource *r;
|
struct resource *r;
|
||||||
|
|
||||||
r = rb532_gpio_reg0_res;
|
r = rb532_gpio_reg0_res;
|
||||||
rb532_gpio_chip->regbase = ioremap_nocache(r->start, r->end - r->start);
|
rb532_gpio_chip->regbase = ioremap_nocache(r->start, resource_size(r));
|
||||||
|
|
||||||
if (!rb532_gpio_chip->regbase) {
|
if (!rb532_gpio_chip->regbase) {
|
||||||
printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");
|
printk(KERN_ERR "rb532: cannot remap GPIO register 0\n");
|
||||||
|
|
|
@ -679,7 +679,7 @@ static int __devinit mddi_probe(struct platform_device *pdev)
|
||||||
printk(KERN_ERR "mddi: no associated mem resource!\n");
|
printk(KERN_ERR "mddi: no associated mem resource!\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
mddi->base = ioremap(resource->start, resource->end - resource->start);
|
mddi->base = ioremap(resource->start, resource_size(resource));
|
||||||
if (!mddi->base) {
|
if (!mddi->base) {
|
||||||
printk(KERN_ERR "mddi: failed to remap base!\n");
|
printk(KERN_ERR "mddi: failed to remap base!\n");
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
|
|
|
@ -248,7 +248,7 @@ static int __devinit bcm63xx_wdt_probe(struct platform_device *pdev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
bcm63xx_wdt_device.regs = ioremap_nocache(r->start, r->end - r->start);
|
bcm63xx_wdt_device.regs = ioremap_nocache(r->start, resource_size(r));
|
||||||
if (!bcm63xx_wdt_device.regs) {
|
if (!bcm63xx_wdt_device.regs) {
|
||||||
dev_err(&pdev->dev, "failed to remap I/O resources\n");
|
dev_err(&pdev->dev, "failed to remap I/O resources\n");
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
|
|
Loading…
Reference in New Issue