From: Dmitry Torokhov <dtor_core@ameritech.net>
To: Vojtech Pavlik <vojtech@suse.cz>
Cc: Andrew Morton <akpm@osdl.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 17/19] serio use bus' default driver/device attributes
Date: Mon, 28 Jun 2004 00:25:52 -0500 [thread overview]
Message-ID: <200406280025.54154.dtor_core@ameritech.net> (raw)
In-Reply-To: <200406280024.53717.dtor_core@ameritech.net>
===================================================================
ChangeSet@1.1791, 2004-06-27 19:39:04-05:00, dtor_core@ameritech.net
Input: Switch to use bus' default device and driver attributes to
manage serio sysfs attributes
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
serio.c | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
===================================================================
diff -Nru a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
--- a/drivers/input/serio/serio.c 2004-06-27 21:23:42 -05:00
+++ b/drivers/input/serio/serio.c 2004-06-27 21:23:42 -05:00
@@ -245,14 +245,12 @@
struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%s\n", serio->name);
}
-static DEVICE_ATTR(description, S_IRUGO, serio_show_description, NULL);
static ssize_t serio_show_legacy_position(struct device *dev, char *buf)
{
struct serio *serio = to_serio_port(dev);
return sprintf(buf, "%s\n", serio->phys);
}
-static DEVICE_ATTR(legacy_position, S_IRUGO, serio_show_legacy_position, NULL);
static ssize_t serio_show_driver(struct device *dev, char *buf)
{
@@ -290,7 +288,14 @@
return retval;
}
-static DEVICE_ATTR(driver, S_IWUSR | S_IRUGO, serio_show_driver, serio_rebind_driver);
+
+static struct device_attribute serio_device_attrs[] = {
+ __ATTR(description, S_IRUGO, serio_show_description, NULL),
+ __ATTR(legacy_position, S_IRUGO, serio_show_legacy_position, NULL),
+ __ATTR(driver, S_IWUSR | S_IRUGO, serio_show_driver, serio_rebind_driver),
+ __ATTR_NULL
+};
+
static void serio_release_port(struct device *dev)
{
@@ -312,9 +317,6 @@
if (serio->parent)
serio->dev.parent = &serio->parent->dev;
device_register(&serio->dev);
- device_create_file(&serio->dev, &dev_attr_description);
- device_create_file(&serio->dev, &dev_attr_legacy_position);
- device_create_file(&serio->dev, &dev_attr_driver);
}
/*
@@ -489,7 +491,11 @@
struct serio_driver *driver = to_serio_driver(drv);
return sprintf(buf, "%s\n", driver->description ? driver->description : "(none)");
}
-static DRIVER_ATTR(description, S_IRUGO, serio_driver_show_description, NULL);
+
+static struct driver_attribute serio_driver_attrs[] = {
+ __ATTR(description, S_IRUGO, serio_driver_show_description, NULL),
+ __ATTR_NULL
+};
void serio_register_driver(struct serio_driver *drv)
{
@@ -501,7 +507,6 @@
drv->driver.bus = &serio_bus;
driver_register(&drv->driver);
- driver_create_file(&drv->driver, &driver_attr_description);
if (drv->manual_bind)
goto out;
@@ -607,6 +612,8 @@
return -1;
}
+ serio_bus.dev_attrs = serio_device_attrs;
+ serio_bus.drv_attrs = serio_driver_attrs;
bus_register(&serio_bus);
return 0;
next prev parent reply other threads:[~2004-06-28 5:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-06-28 5:08 [PATCH 0/19] New set of input patches Dmitry Torokhov
2004-06-28 5:09 ` [PATCH 1/19] psmouse state locking Dmitry Torokhov
2004-06-28 5:10 ` [PATCH 2/19] serio connect/disconnect mandatory Dmitry Torokhov
2004-06-28 5:11 ` [PATCH 3/19] serio renames 1 Dmitry Torokhov
2004-06-28 5:12 ` [PATCH 4/19] serio renames 2 Dmitry Torokhov
2004-06-28 5:13 ` [PATCH 5/19] serio dynamic allocation Dmitry Torokhov
2004-06-28 5:14 ` [PATCH 6/19] serio avoid recursion Dmitry Torokhov
2004-06-28 5:15 ` [PATCH 7/19] serio sysfs intergration Dmitry Torokhov
2004-06-28 5:16 ` [PATCH 8/19] serio rebind Dmitry Torokhov
2004-06-28 5:17 ` PATCH 9/19] serio manual bind Dmitry Torokhov
2004-06-28 5:17 ` [PATCH 10/19] serio_raw driver Dmitry Torokhov
2004-06-28 5:19 ` [PATCH 11/19] add platform_device_register_simple Dmitry Torokhov
2004-06-28 5:19 ` [PATCH 12/19] convert i8042 into a platform device Dmitry Torokhov
2004-06-28 5:21 ` [PATCH 13/19] more platform device conversions Dmitry Torokhov
2004-06-28 5:22 ` [PATCH 14/19] bind serio ports and their parents Dmitry Torokhov
2004-06-28 5:23 ` [PATCH 15/19] synaptics passthrough handling Dmitry Torokhov
2004-06-28 5:24 ` [PATCH 16/19] add bus' default driver attributes Dmitry Torokhov
2004-06-28 5:25 ` Dmitry Torokhov [this message]
2004-06-28 5:26 ` [PATCH 18/19] add driver_find Dmitry Torokhov
2004-06-28 5:27 ` [PATCH 19/19] serio use driver_find Dmitry Torokhov
2004-06-28 6:52 ` [PATCH 0/19] New set of input patches Vojtech Pavlik
2004-06-28 7:13 ` Dmitry Torokhov
2004-06-28 7:51 ` Vojtech Pavlik
2004-06-28 10:32 ` Neil Brown
2004-06-28 12:13 ` Vojtech Pavlik
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=200406280025.54154.dtor_core@ameritech.net \
--to=dtor_core@ameritech.net \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.cz \
/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.