diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 10:31:34 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 10:31:34 -0600 |
| commit | 723ec4d06cb2eed481436cfe008f5f63c45e88fd (patch) | |
| tree | e59112af8616e8fbc0cc6c2219b49fd2f05bfc41 /drivers/pci/msi.c | |
| parent | a3b6bbd5774c13dab89d72f79976ba762913b2f2 (diff) | |
| parent | f39d5b72913e2a9ff00ba5ab145ee05a888b1286 (diff) | |
| download | op-kernel-dev-723ec4d06cb2eed481436cfe008f5f63c45e88fd.zip op-kernel-dev-723ec4d06cb2eed481436cfe008f5f63c45e88fd.tar.gz | |
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
Diffstat (limited to 'drivers/pci/msi.c')
| -rw-r--r-- | drivers/pci/msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 00cc78c7..bbff7d5 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -484,12 +484,12 @@ static struct msi_attribute mode_attribute = __ATTR(mode, S_IRUGO, show_msi_mode, NULL); -struct attribute *msi_irq_default_attrs[] = { +static struct attribute *msi_irq_default_attrs[] = { &mode_attribute.attr, NULL }; -void msi_kobj_release(struct kobject *kobj) +static void msi_kobj_release(struct kobject *kobj) { struct msi_desc *entry = to_msi_desc(kobj); |
