Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10874f5a authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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:

  54b956b9 Remove __dev* markings from init.h
  a8e4b9c1 PCI: add generic pci_hp_add_bridge()
  0ab2b57f PCI: fix section mismatch warning in pci_scan_child_bus
  451124a7 PCI: fix 4x section mismatch warnings

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 8895d3bc

drivers/pci/hotplug-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#include <linux/export.h>

#include "pci.h"



int __ref pci_hp_add_bridge(struct pci_dev *dev)

int pci_hp_add_bridge(struct pci_dev *dev)

{

	struct pci_bus *parent = dev->bus;

	int pass, busnr, start = parent->busn_res.start;

drivers/pci/hotplug/acpiphp_glue.c

+1 −1
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ static int acpiphp_rescan_slot(struct acpiphp_slot *slot) 
 * This function should be called per *physical slot*,

 * not per each slot object in ACPI namespace.

 */

static void __ref enable_slot(struct acpiphp_slot *slot)

static void enable_slot(struct acpiphp_slot *slot)

{

	struct pci_dev *dev;

	struct pci_bus *bus = slot->bus;

drivers/pci/hotplug/cpci_hotplug_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ int cpci_led_off(struct slot* slot) 
 * Device configuration functions

 */



int __ref cpci_configure_slot(struct slot *slot)

int cpci_configure_slot(struct slot *slot)

{

	struct pci_dev *dev;

	struct pci_bus *parent;

drivers/pci/hotplug/shpchp_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "../pci.h"

#include "shpchp.h"



int __ref shpchp_configure_device(struct slot *p_slot)

int shpchp_configure_device(struct slot *p_slot)

{

	struct pci_dev *dev;

	struct controller *ctrl = p_slot->ctrl;

drivers/pci/pci.h

+4 −4
Original line number Diff line number Diff line
@@ -201,9 +201,9 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, 
		    struct resource *res, unsigned int reg);

int pci_resource_bar(struct pci_dev *dev, int resno, enum pci_bar_type *type);

void pci_configure_ari(struct pci_dev *dev);

void __ref __pci_bus_size_bridges(struct pci_bus *bus,

void __pci_bus_size_bridges(struct pci_bus *bus,

			struct list_head *realloc_head);

void __ref __pci_bus_assign_resources(const struct pci_bus *bus,

void __pci_bus_assign_resources(const struct pci_bus *bus,

				struct list_head *realloc_head,

				struct list_head *fail_head);