]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
PCI: annotate pci_rescan_bus as __ref, not __devinit
authorAlex Chiang <achiang@hp.com>
Thu, 2 Apr 2009 00:24:12 +0000 (18:24 -0600)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Mon, 6 Apr 2009 18:26:07 +0000 (11:26 -0700)
pci_rescan_bus was annotated as __devinit, which is wrong,
because it will never be part of device initialization.
Howevever, we can't simply drop the annotation, because then we
get section warnings about calling pci_scan_child_bus (which is
correctly marked as __devinit).

pci_rescan_bus will only get built when CONFIG_HOTPLUG is set,
meaning that __devinit is a nop, so we know that pci_scan_child_bus
has not been freed.

Annotate as __ref to silence modpost.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/probe.c

index e2f3dd098cfa16c710814dcffbb1f294f7197b0c..8eb50dffb78a177c02954442074d97118261db3c 100644 (file)
@@ -1220,7 +1220,7 @@ EXPORT_SYMBOL(pci_scan_bus_parented);
  *
  * Returns the max number of subordinate bus discovered.
  */
-unsigned int __devinit pci_rescan_bus(struct pci_bus *bus)
+unsigned int __ref pci_rescan_bus(struct pci_bus *bus)
 {
        unsigned int max;
        struct pci_dev *dev;