|
@@ -286,7 +286,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-void pci_read_bridge_bases(struct pci_bus *child)
|
|
|
|
|
|
+void __devinit pci_read_bridge_bases(struct pci_bus *child)
|
|
{
|
|
{
|
|
struct pci_dev *dev = child->self;
|
|
struct pci_dev *dev = child->self;
|
|
u8 io_base_lo, io_limit_lo;
|
|
u8 io_base_lo, io_limit_lo;
|
|
@@ -472,7 +472,7 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
|
|
* them, we proceed to assigning numbers to the remaining buses in
|
|
* them, we proceed to assigning numbers to the remaining buses in
|
|
* order to avoid overlaps between old and new bus numbers.
|
|
* order to avoid overlaps between old and new bus numbers.
|
|
*/
|
|
*/
|
|
-int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass)
|
|
|
|
|
|
+int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
|
|
{
|
|
{
|
|
struct pci_bus *child;
|
|
struct pci_bus *child;
|
|
int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
|
|
int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
|
|
@@ -1008,7 +1008,7 @@ int pci_scan_slot(struct pci_bus *bus, int devfn)
|
|
return nr;
|
|
return nr;
|
|
}
|
|
}
|
|
|
|
|
|
-unsigned int pci_scan_child_bus(struct pci_bus *bus)
|
|
|
|
|
|
+unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
|
|
{
|
|
{
|
|
unsigned int devfn, pass, max = bus->secondary;
|
|
unsigned int devfn, pass, max = bus->secondary;
|
|
struct pci_dev *dev;
|
|
struct pci_dev *dev;
|
|
@@ -1116,7 +1116,7 @@ err_out:
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
|
|
-struct pci_bus *pci_scan_bus_parented(struct device *parent,
|
|
|
|
|
|
+struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
|
|
int bus, struct pci_ops *ops, void *sysdata)
|
|
int bus, struct pci_ops *ops, void *sysdata)
|
|
{
|
|
{
|
|
struct pci_bus *b;
|
|
struct pci_bus *b;
|