lkml.org 
[lkml]   [2004]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectPATCH: (as177) Add class_device_unregister_wait() and platform_device_unregister_wait() to the driver model core
Since I haven't seen any progress towards implementing the 
class_device_unregister_wait() and platform_device_unregister_wait()
functions, here is my attempt. This also fixes an unnecessary WARN_ON
about devices with no release() function if the completion pointer is set.

Alan Stern


===== device.h 1.89 vs edited =====
--- 1.89/include/linux/device.h Tue Jan 20 11:58:44 2004
+++ edited/include/linux/device.h Fri Jan 23 11:00:34 2004
@@ -186,6 +186,7 @@
struct class_device {
struct list_head node;

+ struct completion * complete; /* Notification for freeing. */
struct kobject kobj;
struct class * class; /* required */
struct device * dev; /* not necessary, but nice to have */
@@ -209,6 +210,7 @@

extern int class_device_register(struct class_device *);
extern void class_device_unregister(struct class_device *);
+extern void class_device_unregister_wait(struct class_device *);
extern void class_device_initialize(struct class_device *);
extern int class_device_add(struct class_device *);
extern void class_device_del(struct class_device *);
@@ -380,6 +382,7 @@

extern int platform_device_register(struct platform_device *);
extern void platform_device_unregister(struct platform_device *);
+extern void platform_device_unregister_wait(struct platform_device *);

extern struct bus_type platform_bus_type;
extern struct device platform_bus;
===== class.c 1.45 vs edited =====
--- 1.45/drivers/base/class.c Tue Jan 20 17:07:57 2004
+++ edited/drivers/base/class.c Fri Jan 23 11:05:57 2004
@@ -205,17 +205,20 @@
{
struct class_device *cd = to_class_dev(kobj);
struct class * cls = cd->class;
+ struct completion * c = cd->complete;

pr_debug("device class '%s': release.\n",cd->class_id);

if (cls->release)
cls->release(cd);
- else {
+ else if (!c) {
printk(KERN_ERR "Device class '%s' does not have a release() function, "
"it is broken and must be fixed.\n",
cd->class_id);
WARN_ON(1);
}
+ if (c)
+ complete(c);
}

static struct kobj_type ktype_class_device = {
@@ -363,6 +366,16 @@
class_device_put(class_dev);
}

+void class_device_unregister_wait(struct class_device *class_dev)
+{
+ struct completion c;
+
+ init_completion(&c);
+ class_dev->complete = &c;
+ class_device_unregister(class_dev);
+ wait_for_completion(&c);
+}
+
int class_device_rename(struct class_device *class_dev, char *new_name)
{
class_dev = class_device_get(class_dev);
@@ -470,6 +483,7 @@

EXPORT_SYMBOL(class_device_register);
EXPORT_SYMBOL(class_device_unregister);
+EXPORT_SYMBOL(class_device_unregister_wait);
EXPORT_SYMBOL(class_device_initialize);
EXPORT_SYMBOL(class_device_add);
EXPORT_SYMBOL(class_device_del);
===== core.c 1.73 vs edited =====
--- 1.73/drivers/base/core.c Tue Jan 20 17:07:57 2004
+++ edited/drivers/base/core.c Wed Jan 21 11:43:24 2004
@@ -83,7 +83,7 @@

if (dev->release)
dev->release(dev);
- else {
+ else if (!c) {
printk(KERN_ERR "Device '%s' does not have a release() function, "
"it is broken and must be fixed.\n",
dev->bus_id);
===== platform.c 1.11 vs edited =====
--- 1.11/drivers/base/platform.c Tue Dec 30 13:25:09 2003
+++ edited/drivers/base/platform.c Fri Jan 23 11:06:44 2004
@@ -46,6 +46,12 @@
device_unregister(&pdev->dev);
}

+void platform_device_unregister_wait(struct platform_device * pdev)
+{
+ if (pdev)
+ device_unregister_wait(&pdev->dev);
+}
+

/**
* platform_match - bind platform device to platform driver.
@@ -113,3 +119,4 @@
EXPORT_SYMBOL(platform_bus_type);
EXPORT_SYMBOL(platform_device_register);
EXPORT_SYMBOL(platform_device_unregister);
+EXPORT_SYMBOL(platform_device_unregister_wait);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 14:00    [W:0.067 / U:0.084 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site