From: Dmitry Torokhov <dtor_core@ameritech.net>
To: linux-kernel@vger.kernel.org
Cc: Greg KH <gregkh@suse.de>, Jean Delvare <khali@linux-fr.org>
Subject: [RFC/PATCH 3/5] sysfs: (driver/pci) if show/store is missing return -ENOSYS
Date: Thu, 28 Apr 2005 00:42:19 -0500 [thread overview]
Message-ID: <200504280042.20120.dtor_core@ameritech.net> (raw)
In-Reply-To: <200504280030.10214.dtor_core@ameritech.net>
sysfs: fix drivers/pci so if an attribute does not implement
show or store method read/write will return -ENOSYS
instead of 0.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
hotplug/pci_hotplug_core.c | 4 ++--
hotplug/rpadlpar_sysfs.c | 2 +-
pci-driver.c | 26 ++++++++++++++------------
3 files changed, 17 insertions(+), 15 deletions(-)
Index: dtor/drivers/pci/hotplug/rpadlpar_sysfs.c
===================================================================
--- dtor.orig/drivers/pci/hotplug/rpadlpar_sysfs.c
+++ dtor/drivers/pci/hotplug/rpadlpar_sysfs.c
@@ -48,7 +48,7 @@ dlpar_attr_store(struct kobject * kobj,
struct dlpar_io_attr *dlpar_attr = container_of(attr,
struct dlpar_io_attr, attr);
return dlpar_attr->store ?
- dlpar_attr->store(dlpar_attr, buf, nbytes) : 0;
+ dlpar_attr->store(dlpar_attr, buf, nbytes) : -ENOSYS;
}
static struct sysfs_ops dlpar_attr_sysfs_ops = {
Index: dtor/drivers/pci/pci-driver.c
===================================================================
--- dtor.orig/drivers/pci/pci-driver.c
+++ dtor/drivers/pci/pci-driver.c
@@ -327,13 +327,14 @@ pci_driver_attr_show(struct kobject * ko
{
struct device_driver *driver = kobj_to_pci_driver(kobj);
struct driver_attribute *dattr = attr_to_driver_attribute(attr);
- ssize_t ret = 0;
+ ssize_t ret;
- if (get_driver(driver)) {
- if (dattr->show)
- ret = dattr->show(driver, buf);
- put_driver(driver);
- }
+ if (!get_driver(driver))
+ return -ENODEV;
+
+ ret = dattr->show ? dattr->show(driver, buf) : -ENOSYS;
+
+ put_driver(driver);
return ret;
}
@@ -343,13 +344,14 @@ pci_driver_attr_store(struct kobject * k
{
struct device_driver *driver = kobj_to_pci_driver(kobj);
struct driver_attribute *dattr = attr_to_driver_attribute(attr);
- ssize_t ret = 0;
+ ssize_t ret;
- if (get_driver(driver)) {
- if (dattr->store)
- ret = dattr->store(driver, buf, count);
- put_driver(driver);
- }
+ if (!get_driver(driver))
+ return -ENODEV;
+
+ ret = dattr->store ? dattr->store(driver, buf, count) : -ENOSYS;
+
+ put_driver(driver);
return ret;
}
Index: dtor/drivers/pci/hotplug/pci_hotplug_core.c
===================================================================
--- dtor.orig/drivers/pci/hotplug/pci_hotplug_core.c
+++ dtor/drivers/pci/hotplug/pci_hotplug_core.c
@@ -73,7 +73,7 @@ static ssize_t hotplug_slot_attr_show(st
{
struct hotplug_slot *slot = to_hotplug_slot(kobj);
struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr);
- return attribute->show ? attribute->show(slot, buf) : 0;
+ return attribute->show ? attribute->show(slot, buf) : -ENOSYS;
}
static ssize_t hotplug_slot_attr_store(struct kobject *kobj,
@@ -81,7 +81,7 @@ static ssize_t hotplug_slot_attr_store(s
{
struct hotplug_slot *slot = to_hotplug_slot(kobj);
struct hotplug_slot_attribute *attribute = to_hotplug_attr(attr);
- return attribute->store ? attribute->store(slot, buf, len) : 0;
+ return attribute->store ? attribute->store(slot, buf, len) : -ENOSYS;
}
static struct sysfs_ops hotplug_slot_sysfs_ops = {
next prev parent reply other threads:[~2005-04-28 5:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-28 5:30 [RFC/PATCH 0/5] read/write on attribute w/o show/store should return -ENOSYS Dmitry Torokhov
2005-04-28 5:31 ` [RFC/PATCH 1/5] sysfs: if show/store is missing " Dmitry Torokhov
2005-04-28 5:41 ` [RFC/PATCH 2/5] sysfs: (driver/base) " Dmitry Torokhov
2005-04-28 5:42 ` Dmitry Torokhov [this message]
2005-04-28 5:43 ` [RFC/PATCH 4/5] sysfs: (driver/block) " Dmitry Torokhov
2005-04-28 5:44 ` [RFC/PATCH 5/5] sysfs: (rest) " Dmitry Torokhov
2005-04-28 17:26 ` [RFC/PATCH 0/5] read/write on attribute w/o show/store should " Greg KH
2005-04-28 17:37 ` Chris Wright
2005-04-28 17:44 ` Robert Love
2005-04-28 17:51 ` Dmitry Torokhov
2005-04-28 19:56 ` Richard B. Johnson
2005-04-28 20:08 ` Robert Love
2005-04-28 17:42 ` Robert Love
2005-04-29 6:22 ` [PATCH 1/5 (take 2)] sysfs: if show/store is missing return -EIO Dmitry Torokhov
2005-04-29 6:23 ` [PATCH 2/5 (take 2)] sysfs: (driver/base) " Dmitry Torokhov
2005-04-29 6:26 ` [PATCH 4/5 (take 2)] sysfs: (driver/block) " Dmitry Torokhov
2005-04-29 6:26 ` [PATCH 3/5 (take 2)] sysfs: (driver/pci) " Dmitry Torokhov
2005-04-29 6:27 ` [PATCH 5/5 (take 2)] sysfs: (rest) " Dmitry Torokhov
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=200504280042.20120.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=gregkh@suse.de \
--cc=khali@linux-fr.org \
--cc=linux-kernel@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.