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/hotplug/shpchp_sysfs.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/hotplug/shpchp_sysfs.c')
-rw-r--r-- | drivers/pci/hotplug/shpchp_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c index eeb23ce..e8c31fe 100644 --- a/drivers/pci/hotplug/shpchp_sysfs.c +++ b/drivers/pci/hotplug/shpchp_sysfs.c @@ -85,7 +85,7 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha } static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); -int __must_check shpchp_create_ctrl_files (struct controller *ctrl) +int shpchp_create_ctrl_files (struct controller *ctrl) { return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl); } |