From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org
Cc: Jean Delvare <khali@linux-fr.org>, Kay Sievers <kay.sievers@vrfy.org>
Subject: [PATCH 10/20] Driver core: Add support for compatibility classes
Date: Tue, 15 Sep 2009 12:12:46 -0700 [thread overview]
Message-ID: <1253041976-1111-10-git-send-email-gregkh@suse.de> (raw)
In-Reply-To: <20090915181247.GA32167@kroah.com>
From: Jean Delvare <khali@linux-fr.org>
When turning class devices into bus devices, we may need to
temporarily add links in sysfs so that user-space applications
are not confused. This is done by adding the following API:
* Functions to register and unregister compatibility classes.
These appear in sysfs at the same location as regular classes, but
instead of class devices, they contain links to bus devices.
* Functions to create and delete such links. Additionally, the caller
can optionally pass a target device to which a "device" link should
point (typically that would be the device's parent), to fully emulate
the original class device.
The i2c subsystem will be the first user of this API, as i2c adapters
are being converted from class devices to bus devices.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
---
drivers/base/class.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++++
include/linux/device.h | 8 ++++
2 files changed, 95 insertions(+), 0 deletions(-)
diff --git a/drivers/base/class.c b/drivers/base/class.c
index eb85e43..161746d 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -488,6 +488,93 @@ void class_interface_unregister(struct class_interface *class_intf)
class_put(parent);
}
+struct class_compat {
+ struct kobject *kobj;
+};
+
+/**
+ * class_compat_register - register a compatibility class
+ * @name: the name of the class
+ *
+ * Compatibility class are meant as a temporary user-space compatibility
+ * workaround when converting a family of class devices to a bus devices.
+ */
+struct class_compat *class_compat_register(const char *name)
+{
+ struct class_compat *cls;
+
+ cls = kmalloc(sizeof(struct class_compat), GFP_KERNEL);
+ if (!cls)
+ return NULL;
+ cls->kobj = kobject_create_and_add(name, &class_kset->kobj);
+ if (!cls->kobj) {
+ kfree(cls);
+ return NULL;
+ }
+ return cls;
+}
+EXPORT_SYMBOL_GPL(class_compat_register);
+
+/**
+ * class_compat_unregister - unregister a compatibility class
+ * @cls: the class to unregister
+ */
+void class_compat_unregister(struct class_compat *cls)
+{
+ kobject_put(cls->kobj);
+ kfree(cls);
+}
+EXPORT_SYMBOL_GPL(class_compat_unregister);
+
+/**
+ * class_compat_create_link - create a compatibility class device link to
+ * a bus device
+ * @cls: the compatibility class
+ * @dev: the target bus device
+ * @device_link: an optional device to which a "device" link should be created
+ */
+int class_compat_create_link(struct class_compat *cls, struct device *dev,
+ struct device *device_link)
+{
+ int error;
+
+ error = sysfs_create_link(cls->kobj, &dev->kobj, dev_name(dev));
+ if (error)
+ return error;
+
+ /*
+ * Optionally add a "device" link (typically to the parent), as a
+ * class device would have one and we want to provide as much
+ * backwards compatibility as possible.
+ */
+ if (device_link) {
+ error = sysfs_create_link(&dev->kobj, &device_link->kobj,
+ "device");
+ if (error)
+ sysfs_remove_link(cls->kobj, dev_name(dev));
+ }
+
+ return error;
+}
+EXPORT_SYMBOL_GPL(class_compat_create_link);
+
+/**
+ * class_compat_remove_link - remove a compatibility class device link to
+ * a bus device
+ * @cls: the compatibility class
+ * @dev: the target bus device
+ * @device_link: an optional device to which a "device" link was previously
+ * created
+ */
+void class_compat_remove_link(struct class_compat *cls, struct device *dev,
+ struct device *device_link)
+{
+ if (device_link)
+ sysfs_remove_link(&dev->kobj, "device");
+ sysfs_remove_link(cls->kobj, dev_name(dev));
+}
+EXPORT_SYMBOL_GPL(class_compat_remove_link);
+
int __init classes_init(void)
{
class_kset = kset_create_and_add("class", NULL, NULL);
diff --git a/include/linux/device.h b/include/linux/device.h
index e19e40a..62ff53a 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -225,6 +225,14 @@ extern void class_unregister(struct class *class);
__class_register(class, &__key); \
})
+struct class_compat;
+struct class_compat *class_compat_register(const char *name);
+void class_compat_unregister(struct class_compat *cls);
+int class_compat_create_link(struct class_compat *cls, struct device *dev,
+ struct device *device_link);
+void class_compat_remove_link(struct class_compat *cls, struct device *dev,
+ struct device *device_link);
+
extern void class_dev_iter_init(struct class_dev_iter *iter,
struct class *class,
struct device *start,
--
1.6.4.2
next prev parent reply other threads:[~2009-09-15 19:16 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-15 18:12 [GIT PATCH] driver core patches for 2.6.31-git Greg KH
2009-09-15 19:12 ` [PATCH 01/20] Driver core: add new device to bus's list before probing Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 02/20] Driver core: move dev_get/set_drvdata to drivers/base/dd.c Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 03/20] Driver core: Add accessor for device platform data Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 04/20] UIO: remove 'default n' from Kconfig Greg Kroah-Hartman
2009-09-15 19:35 ` Hans J. Koch
2009-09-15 19:12 ` [PATCH 05/20] driver model: constify attribute groups Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 06/20] mem_class: use minor as index instead of searching the array Greg Kroah-Hartman
2009-09-15 19:42 ` Daniel Walker
2009-09-15 19:46 ` Kay Sievers
2009-09-15 20:07 ` Daniel Walker
2009-09-15 20:24 ` Greg KH
2009-09-15 21:18 ` Daniel Walker
2009-09-15 21:20 ` Greg KH
2009-09-15 21:26 ` Daniel Walker
2009-09-15 21:32 ` Greg KH
2009-09-15 22:06 ` Daniel Walker
2009-09-19 15:17 ` Tilman Schmidt
2009-09-19 16:01 ` Daniel Walker
2009-09-15 19:12 ` [PATCH 07/20] mem_class: fix bug Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 08/20] driver-core: move dma-coherent.c from kernel to driver/base Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 09/20] uio: add generic driver for PCI 2.3 devices Greg Kroah-Hartman
2009-09-15 19:12 ` Greg Kroah-Hartman [this message]
2009-09-15 19:12 ` [PATCH 11/20] driver core: platform_device_add_data(): use kmemdup() Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 12/20] hpilo: staging for interrupt handling Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 13/20] hpilo: add interrupt handler Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 14/20] hpilo: add poll f_op Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 15/20] debugfs: Fix mount directory of debugfs by default in events.txt Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 16/20] debugfs: Change debuhgfs directory of trace-events-sample.h Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 17/20] debugfs: Change debugfs directory of IWMC3200 Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 18/20] debugfs: Modified default dir of debugfs for debugging UHCI Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 19/20] debugfs: Modify default debugfs directory for debugging pktcdvd Greg Kroah-Hartman
2009-09-15 19:12 ` [PATCH 20/20] Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev Greg Kroah-Hartman
2009-09-15 23:21 ` Christoph Hellwig
2009-09-15 23:43 ` Greg KH
2009-09-16 12:45 ` [GIT PATCH] driver core patches for 2.6.31-git Christoph Hellwig
2009-09-16 12:59 ` Greg KH
2009-09-16 13:15 ` Christoph Hellwig
2009-09-16 13:59 ` Kay Sievers
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=1253041976-1111-10-git-send-email-gregkh@suse.de \
--to=gregkh@suse.de \
--cc=kay.sievers@vrfy.org \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox