aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-04-12 13:18:07 -0400
committerBjorn Helgaas <bhelgaas@google.com>2013-04-17 12:20:58 -0400
commitd67aed63b8bfa4a06575ed578328b02f909699ee (patch)
treee3d13dff8b71fdc254ce7d6ffceccaef80dc74e8
parentb638d7e7b849ad402aaecfe7edb599687b5eb3a8 (diff)
PCI: Remove __must_check from definitions
The __must_check (gcc "warn_unused_result") attribute only makes sense when compiling the *caller* of the function, so the attribute should appear on the declaration in the header file, not on the definition. The declarations of these functions are already annotated with __must_check. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/pci/hotplug/pci_hotplug_core.c4
-rw-r--r--drivers/pci/hotplug/shpchp_sysfs.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
index 9d4c199a64be..ec20f74c8981 100644
--- a/drivers/pci/hotplug/pci_hotplug_core.c
+++ b/drivers/pci/hotplug/pci_hotplug_core.c
@@ -517,8 +517,8 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
517 * 517 *
518 * Returns 0 if successful, anything else for an error. 518 * Returns 0 if successful, anything else for an error.
519 */ 519 */
520int __must_check pci_hp_change_slot_info(struct hotplug_slot *hotplug, 520int pci_hp_change_slot_info(struct hotplug_slot *hotplug,
521 struct hotplug_slot_info *info) 521 struct hotplug_slot_info *info)
522{ 522{
523 if (!hotplug || !info) 523 if (!hotplug || !info)
524 return -ENODEV; 524 return -ENODEV;
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index eeb23ceae4a8..e8c31fe20566 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
85} 85}
86static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL); 86static DEVICE_ATTR (ctrl, S_IRUGO, show_ctrl, NULL);
87 87
88int __must_check shpchp_create_ctrl_files (struct controller *ctrl) 88int shpchp_create_ctrl_files (struct controller *ctrl)
89{ 89{
90 return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl); 90 return device_create_file (&ctrl->pci_dev->dev, &dev_attr_ctrl);
91} 91}