From ab350343d3e037ef417a7d10684448d19779d1ea Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 12 Apr 2013 11:18:07 -0600 Subject: [PATCH] --- yaml --- r: 362891 b: refs/heads/master c: d67aed63b8bfa4a06575ed578328b02f909699ee h: refs/heads/master i: 362889: 4dde8bdcd6fb41b23c579c57d1b9ef2c7fb4fbbc 362887: c3163004c5cee68acc4a87936da01b82d447f0fd v: v3 --- [refs] | 2 +- trunk/drivers/pci/hotplug/pci_hotplug_core.c | 4 ++-- trunk/drivers/pci/hotplug/shpchp_sysfs.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6a8b81124cff..1d604c837b69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b638d7e7b849ad402aaecfe7edb599687b5eb3a8 +refs/heads/master: d67aed63b8bfa4a06575ed578328b02f909699ee diff --git a/trunk/drivers/pci/hotplug/pci_hotplug_core.c b/trunk/drivers/pci/hotplug/pci_hotplug_core.c index 9d4c199a64be..ec20f74c8981 100644 --- a/trunk/drivers/pci/hotplug/pci_hotplug_core.c +++ b/trunk/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; diff --git a/trunk/drivers/pci/hotplug/shpchp_sysfs.c b/trunk/drivers/pci/hotplug/shpchp_sysfs.c index eeb23ceae4a8..e8c31fe20566 100644 --- a/trunk/drivers/pci/hotplug/shpchp_sysfs.c +++ b/trunk/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); }