From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
Jiang Liu <jiang.liu@huawei.com>, x86 <x86@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-acpi@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH part3 11/11] PCI, sysfs: Clean up rescan/remove with scheule_callback
Date: Sun, 2 Sep 2012 14:52:21 -0700 [thread overview]
Message-ID: <1346622741-30799-12-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1346622741-30799-1-git-send-email-yinghai@kernel.org>
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
prev parent reply other threads:[~2012-09-02 21:53 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-02 21:52 [PATCH part3 00/11] PCI, x86: pci root bus hotplug support - part3 Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 01/11] PCI: Separate out pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 02/11] PCI: Move back pci_rescan_bus() to probe.c Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 03/11] PCI: pci_bus_size_bridges() should not size own bridge Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 04/11] PCI: Use __pci_bus_size_bridges() directly in pci_assign_unassigned_bus_resources() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 05/11] PCI, sysfs: Use device_type and attr_groups with pci dev Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 06/11] PCI, sysfs: Create rescan_bridge under /sys/.../pci/devices/... for pci bridges Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 07/11] PCI: Add pci_bus_add_single_device() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 08/11] PCI: Make pci_rescan_bus_bridge_resize() use pci_scan_bridge Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 09/11] PCI: Clean up rescan_bus_bridge_resize() Yinghai Lu
2012-09-02 21:52 ` [PATCH part3 10/11] PCI: Rescan bus or bridge using callback method too Yinghai Lu
2012-09-02 21:52 ` Yinghai Lu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1346622741-30799-12-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).