aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2009-04-01 20:24:12 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-04-06 14:26:07 -0400
commit5446a6bdb51e71da7a203e395b0b4c668d559a3a (patch)
treeac403024a02a2285defd433da068dc4415af0fbe
parent52a8873ba4e82d6e87f8478b3e7f9c12d8b37c38 (diff)
PCI: annotate pci_rescan_bus as __ref, not __devinit
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>
-rw-r--r--drivers/pci/probe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e2f3dd098cfa..8eb50dffb78a 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1220,7 +1220,7 @@ EXPORT_SYMBOL(pci_scan_bus_parented);
1220 * 1220 *
1221 * Returns the max number of subordinate bus discovered. 1221 * Returns the max number of subordinate bus discovered.
1222 */ 1222 */
1223unsigned int __devinit pci_rescan_bus(struct pci_bus *bus) 1223unsigned int __ref pci_rescan_bus(struct pci_bus *bus)
1224{ 1224{
1225 unsigned int max; 1225 unsigned int max;
1226 struct pci_dev *dev; 1226 struct pci_dev *dev;