diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-01-01 17:40:49 +0100 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-02-22 16:16:56 -0800 |
| commit | b26b2d494b659f988b4d75eb394dfa0ddac415c9 (patch) | |
| tree | d262f333e529a21017dc072e604a626b38520515 /arch/mn10300/unit-asb2305 | |
| parent | 93da6202264ce1256b04db8008a43882ae62d060 (diff) | |
| download | blackbird-op-linux-b26b2d494b659f988b4d75eb394dfa0ddac415c9.tar.gz blackbird-op-linux-b26b2d494b659f988b4d75eb394dfa0ddac415c9.zip | |
resource/PCI: align functions now return start of resource
As suggested by Linus, align functions should return the start
of a resource, not void. An update of "res->start" is no longer
necessary.
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/mn10300/unit-asb2305')
| -rw-r--r-- | arch/mn10300/unit-asb2305/pci-asb2305.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/mn10300/unit-asb2305/pci-asb2305.c b/arch/mn10300/unit-asb2305/pci-asb2305.c index 78cd134ddf7d..b0b3758fba08 100644 --- a/arch/mn10300/unit-asb2305/pci-asb2305.c +++ b/arch/mn10300/unit-asb2305/pci-asb2305.c @@ -31,9 +31,11 @@ * but we want to try to avoid allocating at 0x2900-0x2bff * which might have be mirrored at 0x0100-0x03ff.. */ -void pcibios_align_resource(void *data, struct resource *res, - resource_size_t size, resource_size_t align) +resource_size_t pcibios_align_resource(void *data, struct resource *res, + resource_size_t size, resource_size_t align) { + resource_size_t start = res->start; + #if 0 struct pci_dev *dev = data; @@ -47,14 +49,10 @@ void pcibios_align_resource(void *data, struct resource *res, ); #endif - if (res->flags & IORESOURCE_IO) { - unsigned long start = res->start; + if ((res->flags & IORESOURCE_IO) && (start & 0x300)) + start = (start + 0x3ff) & ~0x3ff; - if (start & 0x300) { - start = (start + 0x3ff) & ~0x3ff; - res->start = start; - } - } + return start; } |
