diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-08 10:37:44 -0500 |
| commit | f7cef064aa01a1ac682c1945cc168b878cb118ff (patch) | |
| tree | 5dc256a4e01689eed60ab3e7a7ab8e50c5bcf602 /drivers/pci/pci-sysfs.c | |
| parent | 1a698a4aba26dd58e8409d325a9a9db22f7cd2db (diff) | |
| parent | ba341d55a420ab4fdd1a53fd395fd59bd65de880 (diff) | |
Merge branch 'driver-core-next' into cgroup/for-3.15
Pending kernfs conversion depends on kernfs improvements in
driver-core-next. Pull it into for-3.15.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 276ef9c1880..4e0acefb756 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -351,28 +351,17 @@ static struct device_attribute dev_rescan_attr = __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store); -static void remove_callback(struct device *dev) -{ - pci_stop_and_remove_bus_device_locked(to_pci_dev(dev)); -} - static ssize_t -remove_store(struct device *dev, struct device_attribute *dummy, +remove_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - int ret = 0; unsigned long val; if (kstrtoul(buf, 0, &val) < 0) return -EINVAL; - /* An attribute cannot be unregistered by one of its own methods, - * so we have to use this roundabout approach. - */ - if (val) - ret = device_schedule_callback(dev, remove_callback); - if (ret) - count = ret; + if (val && device_remove_file_self(dev, attr)) + pci_stop_and_remove_bus_device_locked(to_pci_dev(dev)); return count; } static struct device_attribute dev_remove_attr = __ATTR(remove, |