ChangeSet 1.1733.2.2, 2004/03/16 11:28:52-08:00, [EMAIL PROTECTED]
[PATCH] USB: replace kobject with kref in usb-serial core.
This saves some memory and is easier to understand what is happening.
drivers/usb/serial/usb-serial.c | 25 +++++++++----------------
drivers/usb/serial/usb-serial.h | 5 +++--
2 files changed, 12 insertions(+), 18 deletions(-)
diff -Nru a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
--- a/drivers/usb/serial/usb-serial.c Tue Mar 16 15:01:28 2004
+++ b/drivers/usb/serial/usb-serial.c Tue Mar 16 15:01:28 2004
@@ -391,7 +391,7 @@
struct usb_serial *serial = serial_table[index];
if (serial)
- kobject_get (&serial->kobj);
+ kref_get(&serial->kref);
return serial;
}
@@ -486,7 +486,7 @@
if (retval) {
port->open_count = 0;
module_put(serial->type->owner);
- kobject_put(&serial->kobj);
+ kref_put(&serial->kref);
}
}
bailout:
@@ -518,7 +518,7 @@
}
module_put(port->serial->type->owner);
- kobject_put(&port->serial->kobj);
+ kref_put(&port->serial->kref);
}
static int serial_write (struct tty_struct * tty, int from_user, const unsigned char
*buf, int count)
@@ -748,7 +748,7 @@
begin += length;
length = 0;
}
- kobject_put(&serial->kobj);
+ kref_put(&serial->kref);
}
*eof = 1;
done:
@@ -830,15 +830,15 @@
wake_up_interruptible(&tty->write_wait);
}
-static void destroy_serial (struct kobject *kobj)
+static void destroy_serial(struct kref *kref)
{
struct usb_serial *serial;
struct usb_serial_port *port;
int i;
- dbg ("%s - %s", __FUNCTION__, kobj->name);
+ serial = to_usb_serial(kref);
- serial = to_usb_serial(kobj);
+ dbg ("%s - %s", __FUNCTION__, serial->type->name);
serial_shutdown (serial);
/* return the minor range that this device had */
@@ -886,10 +886,6 @@
kfree (serial);
}
-static struct kobj_type usb_serial_kobj_type = {
- .release = destroy_serial,
-};
-
static void port_release(struct device *dev)
{
struct usb_serial_port *port = to_usb_serial_port(dev);
@@ -930,10 +926,7 @@
serial->interface = interface;
serial->vendor = dev->descriptor.idVendor;
serial->product = dev->descriptor.idProduct;
-
- /* initialize the kobject portion of the usb_device */
- kobject_init(&serial->kobj);
- serial->kobj.ktype = &usb_serial_kobj_type;
+ kref_init(&serial->kref, destroy_serial);
return serial;
}
@@ -1284,7 +1277,7 @@
if (serial) {
/* let the last holder of this object
* cause it to be cleaned up */
- kobject_put (&serial->kobj);
+ kref_put(&serial->kref);
}
dev_info(dev, "device disconnected\n");
}
diff -Nru a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
--- a/drivers/usb/serial/usb-serial.h Tue Mar 16 15:01:28 2004
+++ b/drivers/usb/serial/usb-serial.h Tue Mar 16 15:01:28 2004
@@ -55,6 +55,7 @@
#define __LINUX_USB_SERIAL_H
#include <linux/config.h>
+#include <linux/kref.h>
#define SERIAL_TTY_MAJOR 188 /* Nice legal number now */
#define SERIAL_TTY_MINORS 255 /* loads of devices :) */
@@ -163,10 +164,10 @@
__u16 vendor;
__u16 product;
struct usb_serial_port * port[MAX_NUM_PORTS];
- struct kobject kobj;
+ struct kref kref;
void * private;
};
-#define to_usb_serial(d) container_of(d, struct usb_serial, kobj)
+#define to_usb_serial(d) container_of(d, struct usb_serial, kref)
#define NUM_DONT_CARE (-1)
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id70&alloc_id638&op=click
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
