[PATCH part3 11/11] PCI, sysfs: Clean up rescan/remove with scheule_callback
From: Yinghai Lu <yinghai@kernel.org>
Date: 2012-09-02 21:53:08
Also in:
linux-acpi, lkml
Subsystem:
pci subsystem, the rest · Maintainers:
Bjorn Helgaas, Linus Torvalds
Change to use three return according to Bjorn. Suggested-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/pci-sysfs.c | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 7ebc764..3601912 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c@@ -340,17 +340,17 @@ static ssize_t dev_bridge_rescan_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { - int ret = 0; + int err; unsigned long val; if (kstrtoul(buf, 0, &val) < 0) return -EINVAL; + if (!val) + return count; - if (val) - ret = device_schedule_callback(dev, bridge_rescan_callback); - - if (ret) - count = ret; + err = device_schedule_callback(dev, bridge_rescan_callback); + if (err) + return err; return count; }
@@ -371,7 +371,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)
@@ -380,10 +380,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; }
@@ -399,17 +402,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; }
--
1.7.7