aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
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 /include/linux/pci.h
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 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 16f48e7506ed..1bd9f52b24b8 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -592,7 +592,8 @@ int __must_check pcibios_enable_device(struct pci_dev *, int mask);
592char *pcibios_setup(char *str); 592char *pcibios_setup(char *str);
593 593
594/* Used only when drivers/pci/setup.c is used */ 594/* Used only when drivers/pci/setup.c is used */
595void pcibios_align_resource(void *, struct resource *, resource_size_t, 595resource_size_t pcibios_align_resource(void *, struct resource *,
596 resource_size_t,
596 resource_size_t); 597 resource_size_t);
597void pcibios_update_irq(struct pci_dev *, int irq); 598void pcibios_update_irq(struct pci_dev *, int irq);
598 599
@@ -827,8 +828,9 @@ int __must_check pci_bus_alloc_resource(struct pci_bus *bus,
827 struct resource *res, resource_size_t size, 828 struct resource *res, resource_size_t size,
828 resource_size_t align, resource_size_t min, 829 resource_size_t align, resource_size_t min,
829 unsigned int type_mask, 830 unsigned int type_mask,
830 void (*alignf)(void *, struct resource *, 831 resource_size_t (*alignf)(void *, struct resource *,
831 resource_size_t, resource_size_t), 832 resource_size_t,
833 resource_size_t),
832 void *alignf_data); 834 void *alignf_data);
833void pci_enable_bridges(struct pci_bus *bus); 835void pci_enable_bridges(struct pci_bus *bus);
834 836