Skip to content

Commit

Permalink
PCI: use resource_size() everywhere.
Browse files Browse the repository at this point in the history
This is a cleanup that replaces the resource calculation formula with
resource_size().

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
  • Loading branch information
Zhao, Yu authored and Jesse Barnes committed Oct 20, 2008
1 parent c322b28 commit 022edd8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions drivers/pci/setup-bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ static void pbus_size_io(struct pci_bus *bus)

if (r->parent || !(r->flags & IORESOURCE_IO))
continue;
r_size = r->end - r->start + 1;
r_size = resource_size(r);

if (r_size < 0x400)
/* Might be re-aligned for ISA */
Expand Down Expand Up @@ -350,7 +350,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long

if (r->parent || (r->flags & mask) != type)
continue;
r_size = r->end - r->start + 1;
r_size = resource_size(r);
/* For bridges size != alignment */
align = resource_alignment(r);
order = __ffs(align) - 20;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/setup-res.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
resource_size_t size, min, align;
int ret;

size = res->end - res->start + 1;
size = resource_size(res);
min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;

align = resource_alignment(res);
Expand Down

0 comments on commit 022edd8

Please sign in to comment.