aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 034cb1c7309..3683f6094e3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -305,7 +305,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
305 } 305 }
306} 306}
307 307
308static void __devinit pci_read_bridge_io(struct pci_bus *child) 308static void pci_read_bridge_io(struct pci_bus *child)
309{ 309{
310 struct pci_dev *dev = child->self; 310 struct pci_dev *dev = child->self;
311 u8 io_base_lo, io_limit_lo; 311 u8 io_base_lo, io_limit_lo;
@@ -345,7 +345,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child)
345 } 345 }
346} 346}
347 347
348static void __devinit pci_read_bridge_mmio(struct pci_bus *child) 348static void pci_read_bridge_mmio(struct pci_bus *child)
349{ 349{
350 struct pci_dev *dev = child->self; 350 struct pci_dev *dev = child->self;
351 u16 mem_base_lo, mem_limit_lo; 351 u16 mem_base_lo, mem_limit_lo;
@@ -367,7 +367,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child)
367 } 367 }
368} 368}
369 369
370static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child) 370static void pci_read_bridge_mmio_pref(struct pci_bus *child)
371{ 371{
372 struct pci_dev *dev = child->self; 372 struct pci_dev *dev = child->self;
373 u16 mem_base_lo, mem_limit_lo; 373 u16 mem_base_lo, mem_limit_lo;
@@ -417,7 +417,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
417 } 417 }
418} 418}
419 419
420void __devinit pci_read_bridge_bases(struct pci_bus *child) 420void pci_read_bridge_bases(struct pci_bus *child)
421{ 421{
422 struct pci_dev *dev = child->self; 422 struct pci_dev *dev = child->self;
423 struct resource *res; 423 struct resource *res;
@@ -705,7 +705,7 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
705 * them, we proceed to assigning numbers to the remaining buses in 705 * them, we proceed to assigning numbers to the remaining buses in
706 * order to avoid overlaps between old and new bus numbers. 706 * order to avoid overlaps between old and new bus numbers.
707 */ 707 */
708int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) 708int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
709{ 709{
710 struct pci_bus *child; 710 struct pci_bus *child;
711 int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS); 711 int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
@@ -1586,7 +1586,7 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss)
1586} 1586}
1587EXPORT_SYMBOL_GPL(pcie_bus_configure_settings); 1587EXPORT_SYMBOL_GPL(pcie_bus_configure_settings);
1588 1588
1589unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus) 1589unsigned int pci_scan_child_bus(struct pci_bus *bus)
1590{ 1590{
1591 unsigned int devfn, pass, max = bus->busn_res.start; 1591 unsigned int devfn, pass, max = bus->busn_res.start;
1592 struct pci_dev *dev; 1592 struct pci_dev *dev;
@@ -1790,7 +1790,7 @@ void pci_bus_release_busn_res(struct pci_bus *b)
1790 res, ret ? "can not be" : "is"); 1790 res, ret ? "can not be" : "is");
1791} 1791}
1792 1792
1793struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus, 1793struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
1794 struct pci_ops *ops, void *sysdata, struct list_head *resources) 1794 struct pci_ops *ops, void *sysdata, struct list_head *resources)
1795{ 1795{
1796 struct pci_host_bridge_window *window; 1796 struct pci_host_bridge_window *window;
@@ -1826,7 +1826,7 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
1826EXPORT_SYMBOL(pci_scan_root_bus); 1826EXPORT_SYMBOL(pci_scan_root_bus);
1827 1827
1828/* Deprecated; use pci_scan_root_bus() instead */ 1828/* Deprecated; use pci_scan_root_bus() instead */
1829struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, 1829struct pci_bus *pci_scan_bus_parented(struct device *parent,
1830 int bus, struct pci_ops *ops, void *sysdata) 1830 int bus, struct pci_ops *ops, void *sysdata)
1831{ 1831{
1832 LIST_HEAD(resources); 1832 LIST_HEAD(resources);
@@ -1844,7 +1844,7 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
1844} 1844}
1845EXPORT_SYMBOL(pci_scan_bus_parented); 1845EXPORT_SYMBOL(pci_scan_bus_parented);
1846 1846
1847struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops, 1847struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
1848 void *sysdata) 1848 void *sysdata)
1849{ 1849{
1850 LIST_HEAD(resources); 1850 LIST_HEAD(resources);