aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2010-01-01 11:40:49 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2010-02-22 19:16:56 -0500
commitb26b2d494b659f988b4d75eb394dfa0ddac415c9 (patch)
treed262f333e529a21017dc072e604a626b38520515 /arch/powerpc
parent93da6202264ce1256b04db8008a43882ae62d060 (diff)
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/powerpc')
-rw-r--r--arch/powerpc/kernel/pci-common.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index cadbed679fbb..d7eebbaf01f1 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1181,21 +1181,20 @@ static int skip_isa_ioresource_align(struct pci_dev *dev)
1181 * but we want to try to avoid allocating at 0x2900-0x2bff 1181 * but we want to try to avoid allocating at 0x2900-0x2bff
1182 * which might have be mirrored at 0x0100-0x03ff.. 1182 * which might have be mirrored at 0x0100-0x03ff..
1183 */ 1183 */
1184void pcibios_align_resource(void *data, struct resource *res, 1184resource_size_t pcibios_align_resource(void *data, struct resource *res,
1185 resource_size_t size, resource_size_t align) 1185 resource_size_t size, resource_size_t align)
1186{ 1186{
1187 struct pci_dev *dev = data; 1187 struct pci_dev *dev = data;
1188 resource_size_t start = res->start;
1188 1189
1189 if (res->flags & IORESOURCE_IO) { 1190 if (res->flags & IORESOURCE_IO) {
1190 resource_size_t start = res->start;
1191
1192 if (skip_isa_ioresource_align(dev)) 1191 if (skip_isa_ioresource_align(dev))
1193 return; 1192 return start;
1194 if (start & 0x300) { 1193 if (start & 0x300)
1195 start = (start + 0x3ff) & ~0x3ff; 1194 start = (start + 0x3ff) & ~0x3ff;
1196 res->start = start;
1197 }
1198 } 1195 }
1196
1197 return start;
1199} 1198}
1200EXPORT_SYMBOL(pcibios_align_resource); 1199EXPORT_SYMBOL(pcibios_align_resource);
1201 1200