[PATCH] USB: replace kobject with kref in usb-serial core.

This saves some memory and is easier to understand what is happening.

diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 62327d19c1757835693b170f9896e7d86e8f47d3..609c1d164c12fdb0651f4773c71e7db1f2c816af 100644 (file)
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -391,7 +391,7 @@ struct usb_serial *usb_serial_get_by_index(unsigned index)
        struct usb_serial *serial = serial_table[index];
 
        if (serial)
-               kobject_get (&serial->kobj);
+               kref_get(&serial->kref);
        return serial;
 }
 
@@ -486,7 +486,7 @@ static int serial_open (struct tty_struct *tty, struct file * filp)
                if (retval) {
                        port->open_count = 0;
                        module_put(serial->type->owner);
-                       kobject_put(&serial->kobj);
+                       kref_put(&serial->kref);
                }
        }
 bailout:
@@ -518,7 +518,7 @@ static void serial_close(struct tty_struct *tty, struct file * filp)
        }
 
        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 @@ static int serial_read_proc (char *page, char **start, off_t off, int count, int
                        begin += length;
                        length = 0;
                }
-               kobject_put(&serial->kobj);
+               kref_put(&serial->kref);
        }
        *eof = 1;
 done:
@@ -830,15 +830,15 @@ void usb_serial_port_softint(void *private)
        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 @@ static void destroy_serial (struct kobject *kobj)
        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 @@ static struct usb_serial * create_serial (struct usb_device *dev,
        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 @@ void usb_serial_disconnect(struct usb_interface *interface)
        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 --git a/drivers/usb/serial/usb-serial.h b/drivers/usb/serial/usb-serial.h
index 02dec032da8d30b4e40ab181c07a48fe8dcc0048..a7d0c7783425b8a9009aaa326b0f095dba76be62 100644 (file)
--- a/drivers/usb/serial/usb-serial.h
+++ b/drivers/usb/serial/usb-serial.h
@@ -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 @@ struct usb_serial {
        __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)