Merge branch 'pci/cleanup' into next

* pci/cleanup:
  PCI: Remove "extern" from function declarations
  PCI: Warn about failures instead of "must_check" functions
  PCI: Remove __must_check from definitions
  PCI: Remove unused variables
  PCI: Move cpci_hotplug_init() proto to header file
  PCI: Make local functions/structs static
  PCI: Fix missing prototype for pcie_port_acpi_setup()

Conflicts:
	drivers/pci/hotplug/acpiphp.h
	include/linux/pci.h

diff --cc drivers/pci/bus.c
Simple merge

diff --cc drivers/pci/hotplug/acpiphp.h
index 6a319f42b30cad54994f8cfd92d73654fb6d2fe0,9daddf4b9576c0813b35c8c2cb6c758526cd7830..6fdd49c6f0b91760978139827511a02a7bb10e7d
--- 1/drivers/pci/hotplug/acpiphp.h
--- 2/drivers/pci/hotplug/acpiphp.h
+++ b/drivers/pci/hotplug/acpiphp.h
@@@ -170,21 -174,23 +170,21 @@@ struct acpiphp_attention_inf
  /* function prototypes */
  
  /* acpiphp_core.c */
- extern int acpiphp_register_attention(struct acpiphp_attention_info*info);
- extern int acpiphp_unregister_attention(struct acpiphp_attention_info *info);
- extern int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot);
- extern void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);
+ int acpiphp_register_attention(struct acpiphp_attention_info*info);
+ int acpiphp_unregister_attention(struct acpiphp_attention_info *info);
+ int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot);
+ void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);
  
  /* acpiphp_glue.c */
 -int acpiphp_glue_init(void);
 -void acpiphp_glue_exit(void);
  typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);
  
- extern int acpiphp_enable_slot (struct acpiphp_slot *slot);
- extern int acpiphp_disable_slot (struct acpiphp_slot *slot);
- extern int acpiphp_eject_slot (struct acpiphp_slot *slot);
- extern u8 acpiphp_get_power_status (struct acpiphp_slot *slot);
- extern u8 acpiphp_get_attention_status (struct acpiphp_slot *slot);
- extern u8 acpiphp_get_latch_status (struct acpiphp_slot *slot);
- extern u8 acpiphp_get_adapter_status (struct acpiphp_slot *slot);
+ int acpiphp_enable_slot(struct acpiphp_slot *slot);
+ int acpiphp_disable_slot(struct acpiphp_slot *slot);
+ int acpiphp_eject_slot(struct acpiphp_slot *slot);
+ u8 acpiphp_get_power_status(struct acpiphp_slot *slot);
+ u8 acpiphp_get_attention_status(struct acpiphp_slot *slot);
+ u8 acpiphp_get_latch_status(struct acpiphp_slot *slot);
+ u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot);
  
  /* variables */
  extern bool acpiphp_debug;

diff --cc drivers/pci/pcie/aer/aer_inject.c
Simple merge

diff --cc include/linux/pci.h
index 4a6ee631a0c5fab531a90435f35fcd775f21f2d0,614512bed7b0b141c4985ec5965a2817a9676131..8aaca26a2b320b2a747ed4ca009e34eddc90c198
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -690,11 -675,9 +690,11 @@@ extern struct bus_type pci_bus_type
   * code, or pci core code. */
  extern struct list_head pci_root_buses;       /* list of all known PCI buses */
  /* Some device drivers need know if pci is initiated */
- extern int no_pci_devices(void);
+ int no_pci_devices(void);
  
  void pcibios_resource_survey_bus(struct pci_bus *bus);
 +void pcibios_add_bus(struct pci_bus *bus);
 +void pcibios_remove_bus(struct pci_bus *bus);
  void pcibios_fixup_bus(struct pci_bus *);
  int __must_check pcibios_enable_device(struct pci_dev *, int mask);
  /* Architecture specific versions may override this (weak) */
@@@ -1834,13 -1816,13 +1833,13 @@@ int pci_vpd_find_info_keyword(const u8 
  /* PCI <-> OF binding helpers */
  #ifdef CONFIG_OF
  struct device_node;
- extern void pci_set_of_node(struct pci_dev *dev);
- extern void pci_release_of_node(struct pci_dev *dev);
- extern void pci_set_bus_of_node(struct pci_bus *bus);
- extern void pci_release_bus_of_node(struct pci_bus *bus);
+ void pci_set_of_node(struct pci_dev *dev);
+ void pci_release_of_node(struct pci_dev *dev);
+ void pci_set_bus_of_node(struct pci_bus *bus);
+ void pci_release_bus_of_node(struct pci_bus *bus);
  
  /* Arch may override this (weak) */
- extern struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
 -struct device_node * __weak pcibios_get_phb_of_node(struct pci_bus *bus);
++struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
  
  static inline struct device_node *
  pci_device_to_OF_node(const struct pci_dev *pdev)