From bfc03874c591eaecfcb7f557180cac629e454a8a Mon Sep 17 00:00:00 2001 From: "Zhao, Yu" Date: Mon, 13 Oct 2008 19:24:28 +0800 Subject: [PATCH] --- yaml --- r: 116719 b: refs/heads/master c: 022edd86d7c864bc8fadc3c8ac4e6a464472ab05 h: refs/heads/master i: 116717: ab8bf10936a3281836d73692c7e170e4475e1052 116715: 76c9a3bb96187505a46332bdfca37a9e2e049536 116711: d5edf1651944353756b2d4382f5af709ce19732c 116703: 508dd21f85af0b18c2235fde19f03334344481f6 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 4 ++-- trunk/drivers/pci/setup-res.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2c6945b69648..f2cb03a300f8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c322b28a04c084a467a862766f74c40c917a721c +refs/heads/master: 022edd86d7c864bc8fadc3c8ac4e6a464472ab05 diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index 471a429d7a20..ea979f2bc6db 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/trunk/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/trunk/drivers/pci/setup-res.c b/trunk/drivers/pci/setup-res.c index d4b5c690eaa7..2dbd96cce2d8 100644 --- a/trunk/drivers/pci/setup-res.c +++ b/trunk/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);