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
This commit is contained in:
@@ -212,8 +212,8 @@ out:
|
||||
return ops->read(bus, devfn, where, size, val);
|
||||
}
|
||||
|
||||
int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where, int size,
|
||||
u32 val)
|
||||
static int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where,
|
||||
int size, u32 val)
|
||||
{
|
||||
u32 *sim;
|
||||
struct aer_error *err;
|
||||
|
Reference in New Issue
Block a user