diff options
| author | Michal Simek <monstr@monstr.eu> | 2010-04-16 09:04:51 +0200 |
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2010-05-06 11:21:57 +0200 |
| commit | c86fac4382b3fb238a520ab5f2fa200c6a868b7f (patch) | |
| tree | e10577f94fb0d3c2ef86fd6ba274ee4e702d184d /arch/microblaze | |
| parent | 8a66da71fa84d08bef7d1678db77df77dccefa20 (diff) | |
| download | blackbird-op-linux-c86fac4382b3fb238a520ab5f2fa200c6a868b7f.tar.gz blackbird-op-linux-c86fac4382b3fb238a520ab5f2fa200c6a868b7f.zip | |
microblaze: resource/PCI: align functions now return start of resource
This change should be part of b26b2d494b659f988b4d75eb394dfa0ddac415c9
Origin description:
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.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
| -rw-r--r-- | arch/microblaze/pci/pci-common.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c index 5e569fa9b87b..01c8c97c15b7 100644 --- a/arch/microblaze/pci/pci-common.c +++ b/arch/microblaze/pci/pci-common.c @@ -1131,21 +1131,20 @@ static int skip_isa_ioresource_align(struct pci_dev *dev) * 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 pcibios_align_resource(void *data, const struct resource *res, resource_size_t size, resource_size_t align) { struct pci_dev *dev = data; + resource_size_t start = res->start; if (res->flags & IORESOURCE_IO) { - resource_size_t start = res->start; - if (skip_isa_ioresource_align(dev)) - return; - if (start & 0x300) { + return start; + if (start & 0x300) start = (start + 0x3ff) & ~0x3ff; - res->start = start; - } } + + return start; } EXPORT_SYMBOL(pcibios_align_resource); |
