diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:14:46 -0700 |
---|---|---|
committer | Yinghai Lu <yinghai@kernel.org> | 2012-09-17 22:14:46 -0700 |
commit | 282e2db3b58d56b5236ee755e1527574df0d298e (patch) | |
tree | 9138b870eb12b211b82cd81da1b38934ef863b28 | |
parent | 277df390baeab7ba6aa136356b677a096c890c0c (diff) | |
download | linux-yinghai-282e2db3b58d56b5236ee755e1527574df0d298e.tar.gz |
PCI, sysfs: Clean up rescan/remove with scheule_callbackfor-pci-root-bus-hotplug-part3
Change to use three return according to Bjorn.
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
-rw-r--r-- | drivers/pci/pci-sysfs.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 60e04b227763b..b30855869a3a2 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -340,7 +340,7 @@ static ssize_t remove_store(struct device *dev, struct device_attribute *dummy, const char *buf, size_t count) { - int ret = 0; + int err; unsigned long val; if (strict_strtoul(buf, 0, &val) < 0) @@ -349,10 +349,13 @@ remove_store(struct device *dev, struct device_attribute *dummy, /* 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) + return count; + + err = device_schedule_callback(dev, remove_callback); + if (err) + return err; + return count; } @@ -372,17 +375,17 @@ static ssize_t dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - int ret = 0; + int err; unsigned long val; if (strict_strtoul(buf, 0, &val) < 0) return -EINVAL; + if (!val) + return count; - if (val) - ret = device_schedule_callback(dev, bus_rescan_callback); - - if (ret) - count = ret; + err = device_schedule_callback(dev, bus_rescan_callback); + if (err) + return err; return count; } |