Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / serial / bus.c

diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index 2f612c2..e9f9f4b 100644 (file)
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -18,7 +18,7 @@
 
 static int usb_serial_device_match (struct device *dev, struct device_driver *drv)
 {
-       struct usb_serial_device_type *driver;
+       struct usb_serial_driver *driver;
        const struct usb_serial_port *port;
 
        /*
@@ -37,14 +37,9 @@ static int usb_serial_device_match (struct device *dev, struct device_driver *dr
        return 0;
 }
 
-struct bus_type usb_serial_bus_type = {
-       .name =         "usb-serial",
-       .match =        usb_serial_device_match,
-};
-
 static int usb_serial_device_probe (struct device *dev)
 {
-       struct usb_serial_device_type *driver;
+       struct usb_serial_driver *driver;
        struct usb_serial_port *port;
        int retval = 0;
        int minor;
@@ -57,13 +52,13 @@ static int usb_serial_device_probe (struct device *dev)
 
        driver = port->serial->type;
        if (driver->port_probe) {
-               if (!try_module_get(driver->owner)) {
+               if (!try_module_get(driver->driver.owner)) {
                        dev_err(dev, "module get failed, exiting\n");
                        retval = -EIO;
                        goto exit;
                }
                retval = driver->port_probe (port);
-               module_put(driver->owner);
+               module_put(driver->driver.owner);
                if (retval)
                        goto exit;
        }
@@ -72,7 +67,7 @@ static int usb_serial_device_probe (struct device *dev)
        tty_register_device (usb_serial_tty_driver, minor, dev);
        dev_info(&port->serial->dev->dev, 
                 "%s converter now attached to ttyUSB%d\n",
-                driver->name, minor);
+                driver->description, minor);
 
 exit:
        return retval;
@@ -80,7 +75,7 @@ exit:
 
 static int usb_serial_device_remove (struct device *dev)
 {
-       struct usb_serial_device_type *driver;
+       struct usb_serial_driver *driver;
        struct usb_serial_port *port;
        int retval = 0;
        int minor;
@@ -92,43 +87,42 @@ static int usb_serial_device_remove (struct device *dev)
 
        driver = port->serial->type;
        if (driver->port_remove) {
-               if (!try_module_get(driver->owner)) {
+               if (!try_module_get(driver->driver.owner)) {
                        dev_err(dev, "module get failed, exiting\n");
                        retval = -EIO;
                        goto exit;
                }
                retval = driver->port_remove (port);
-               module_put(driver->owner);
+               module_put(driver->driver.owner);
        }
 exit:
        minor = port->number;
        tty_unregister_device (usb_serial_tty_driver, minor);
        dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
-                driver->name, minor);
+                driver->description, minor);
 
        return retval;
 }
 
-int usb_serial_bus_register(struct usb_serial_device_type *device)
+struct bus_type usb_serial_bus_type = {
+       .name =         "usb-serial",
+       .match =        usb_serial_device_match,
+       .probe =        usb_serial_device_probe,
+       .remove =       usb_serial_device_remove,
+};
+
+int usb_serial_bus_register(struct usb_serial_driver *driver)
 {
        int retval;
 
-       if (device->short_name)
-               device->driver.name = (char *)device->short_name;
-       else
-               device->driver.name = (char *)device->name;
-       device->driver.bus = &usb_serial_bus_type;
-       device->driver.probe = usb_serial_device_probe;
-       device->driver.remove = usb_serial_device_remove;
-       device->driver.owner = device->owner;
-
-       retval = driver_register(&device->driver);
+       driver->driver.bus = &usb_serial_bus_type;
+       retval = driver_register(&driver->driver);
 
        return retval;
 }
 
-void usb_serial_bus_deregister(struct usb_serial_device_type *device)
+void usb_serial_bus_deregister(struct usb_serial_driver *driver)
 {
-       driver_unregister (&device->driver);
+       driver_unregister(&driver->driver);
 }