Browse Source

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>
Bjorn Helgaas 12 years ago
parent
commit
d67aed63b8
2 changed files with 3 additions and 3 deletions
  1. 2 2
      drivers/pci/hotplug/pci_hotplug_core.c
  2. 1 1
      drivers/pci/hotplug/shpchp_sysfs.c

+ 2 - 2
drivers/pci/hotplug/pci_hotplug_core.c

@@ -517,8 +517,8 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
  *
  * Returns 0 if successful, anything else for an error.
  */
-int __must_check pci_hp_change_slot_info(struct hotplug_slot *hotplug,
-					 struct hotplug_slot_info *info)
+int pci_hp_change_slot_info(struct hotplug_slot *hotplug,
+			    struct hotplug_slot_info *info)
 {
 	if (!hotplug || !info)
 		return -ENODEV;

+ 1 - 1
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);
 }