diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-14 18:11:40 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-29 19:36:44 -0400 |
commit | 10874f5a00266343a06e95da680e8a5a383d9a80 (patch) | |
tree | 541dabfbf3bf3e8dc3419e8a643d7b7db7b83a79 /drivers/pci/probe.c | |
parent | 8895d3bcb8ba960b1b83f95d772b641352ea8e51 (diff) |
PCI: Remove unnecessary __ref annotations
Some PCI functions used to be marked __devinit. When CONFIG_HOTPLUG was
not set, these functions were discarded after boot. A few callers of these
__devinit functions were marked __ref to indicate that they could safely
call the __devinit functions even though the callers were not __devinit.
But CONFIG_HOTPLUG and __devinit are now gone, and the need for the __ref
annotations is also gone, so remove them. Relevant historical commits:
54b956b90360 Remove __dev* markings from init.h
a8e4b9c101ae PCI: add generic pci_hp_add_bridge()
0ab2b57f8db8 PCI: fix section mismatch warning in pci_scan_child_bus
451124a7cc6c PCI: fix 4x section mismatch warnings
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ef09f5f2fe6c..fe89a982a3da 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -719,7 +719,7 @@ add_dev: | |||
719 | return child; | 719 | return child; |
720 | } | 720 | } |
721 | 721 | ||
722 | struct pci_bus *__ref pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr) | 722 | struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr) |
723 | { | 723 | { |
724 | struct pci_bus *child; | 724 | struct pci_bus *child; |
725 | 725 | ||
@@ -1369,7 +1369,7 @@ void pci_device_add(struct pci_dev *dev, struct pci_bus *bus) | |||
1369 | WARN_ON(ret < 0); | 1369 | WARN_ON(ret < 0); |
1370 | } | 1370 | } |
1371 | 1371 | ||
1372 | struct pci_dev *__ref pci_scan_single_device(struct pci_bus *bus, int devfn) | 1372 | struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) |
1373 | { | 1373 | { |
1374 | struct pci_dev *dev; | 1374 | struct pci_dev *dev; |
1375 | 1375 | ||
@@ -1958,7 +1958,7 @@ EXPORT_SYMBOL(pci_scan_bus); | |||
1958 | * | 1958 | * |
1959 | * Returns the max number of subordinate bus discovered. | 1959 | * Returns the max number of subordinate bus discovered. |
1960 | */ | 1960 | */ |
1961 | unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge) | 1961 | unsigned int pci_rescan_bus_bridge_resize(struct pci_dev *bridge) |
1962 | { | 1962 | { |
1963 | unsigned int max; | 1963 | unsigned int max; |
1964 | struct pci_bus *bus = bridge->subordinate; | 1964 | struct pci_bus *bus = bridge->subordinate; |
@@ -1981,7 +1981,7 @@ unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge) | |||
1981 | * | 1981 | * |
1982 | * Returns the max number of subordinate bus discovered. | 1982 | * Returns the max number of subordinate bus discovered. |
1983 | */ | 1983 | */ |
1984 | unsigned int __ref pci_rescan_bus(struct pci_bus *bus) | 1984 | unsigned int pci_rescan_bus(struct pci_bus *bus) |
1985 | { | 1985 | { |
1986 | unsigned int max; | 1986 | unsigned int max; |
1987 | 1987 | ||