treewide: Convert uses of struct resource to resource_size(ptr)
Several fixes as well where the +1 was missing. Done via coccinelle scripts like: @@ struct resource *ptr; @@ - ptr->end - ptr->start + 1 + resource_size(ptr) and some grep and typing. Mostly uncompiled, no cross-compilers. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
@@ -58,7 +58,7 @@ int register_trapped_io(struct trapped_io *tiop)
|
||||
|
||||
for (k = 0; k < tiop->num_resources; k++) {
|
||||
res = tiop->resource + k;
|
||||
len += roundup((res->end - res->start) + 1, PAGE_SIZE);
|
||||
len += roundup(resource_size(res), PAGE_SIZE);
|
||||
flags |= res->flags;
|
||||
}
|
||||
|
||||
@@ -85,7 +85,7 @@ int register_trapped_io(struct trapped_io *tiop)
|
||||
(unsigned long)(tiop->virt_base + len),
|
||||
res->flags & IORESOURCE_IO ? "io" : "mmio",
|
||||
(unsigned long)res->start);
|
||||
len += roundup((res->end - res->start) + 1, PAGE_SIZE);
|
||||
len += roundup(resource_size(res), PAGE_SIZE);
|
||||
}
|
||||
|
||||
tiop->magic = IO_TRAPPED_MAGIC;
|
||||
@@ -128,7 +128,7 @@ void __iomem *match_trapped_io_handler(struct list_head *list,
|
||||
return tiop->virt_base + voffs;
|
||||
}
|
||||
|
||||
len = (res->end - res->start) + 1;
|
||||
len = resource_size(res);
|
||||
voffs += roundup(len, PAGE_SIZE);
|
||||
}
|
||||
}
|
||||
@@ -173,7 +173,7 @@ static unsigned long lookup_address(struct trapped_io *tiop,
|
||||
|
||||
for (k = 0; k < tiop->num_resources; k++) {
|
||||
res = tiop->resource + k;
|
||||
len = roundup((res->end - res->start) + 1, PAGE_SIZE);
|
||||
len = roundup(resource_size(res), PAGE_SIZE);
|
||||
if (address < (vaddr + len))
|
||||
return res->start + (address - vaddr);
|
||||
vaddr += len;
|
||||
|
Reference in New Issue
Block a user