diff options
| author | Zhao, Yu <yu.zhao@intel.com> | 2008-10-13 19:24:28 +0800 | 
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-20 10:54:28 -0700 | 
| commit | 022edd86d7c864bc8fadc3c8ac4e6a464472ab05 (patch) | |
| tree | 6495a6f473837f1c880c052d76ff9358de76297d | |
| parent | c322b28a04c084a467a862766f74c40c917a721c (diff) | |
| download | olio-linux-3.10-022edd86d7c864bc8fadc3c8ac4e6a464472ab05.tar.xz olio-linux-3.10-022edd86d7c864bc8fadc3c8ac4e6a464472ab05.zip  | |
PCI: use resource_size() everywhere.
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>
| -rw-r--r-- | drivers/pci/setup-bus.c | 4 | ||||
| -rw-r--r-- | drivers/pci/setup-res.c | 2 | 
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 471a429d7a2..ea979f2bc6d 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -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 */ @@ -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; diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index d4b5c690eaa..2dbd96cce2d 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -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);  |