i2c: Use resource_size macro
This replace all instances in the i2c busses tree of res->end - res->start + 1 with the handy macro resource_size(res) from ioport.h (coming in from platform_device.h). This was created with a simple sed -i -e 's/\([a-z]*\)->end *- *[a-z]*->start *+ *1/resource_size(\1)/g' Then manually replacing the PXA redefiniton of the same kind of macro manually. Recompiled some ARM defconfigs I could find to make a rough test so it shouldn't break anything, though I couldn't see exactly which configs you need for all the drivers. Signed-off-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
This commit is contained in:
@ -76,7 +76,7 @@ static int i2c_versatile_probe(struct platform_device *dev)
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
if (!request_mem_region(r->start, r->end - r->start + 1, "versatile-i2c")) {
|
||||
if (!request_mem_region(r->start, resource_size(r), "versatile-i2c")) {
|
||||
ret = -EBUSY;
|
||||
goto err_out;
|
||||
}
|
||||
@ -87,7 +87,7 @@ static int i2c_versatile_probe(struct platform_device *dev)
|
||||
goto err_release;
|
||||
}
|
||||
|
||||
i2c->base = ioremap(r->start, r->end - r->start + 1);
|
||||
i2c->base = ioremap(r->start, resource_size(r));
|
||||
if (!i2c->base) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free;
|
||||
@ -118,7 +118,7 @@ static int i2c_versatile_probe(struct platform_device *dev)
|
||||
err_free:
|
||||
kfree(i2c);
|
||||
err_release:
|
||||
release_mem_region(r->start, r->end - r->start + 1);
|
||||
release_mem_region(r->start, resource_size(r));
|
||||
err_out:
|
||||
return ret;
|
||||
}
|
||||
|
Reference in New Issue
Block a user