Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c
index c08a38402b93a1287562ae254d367c51da12d3e5..83bbb5bca2efcc05af2aba7023f7a846f8fafa0a 100644 (file)
--- a/drivers/usb/serial/bus.c
+++ b/drivers/usb/serial/bus.c
@@ -15,7 +15,8 @@
 #include <linux/usb.h>
 #include <linux/usb/serial.h>
 
-static int usb_serial_device_match (struct device *dev, struct device_driver *drv)
+static int usb_serial_device_match(struct device *dev,
+                                               struct device_driver *drv)
 {
        struct usb_serial_driver *driver;
        const struct usb_serial_port *port;
@@ -36,7 +37,17 @@ static int usb_serial_device_match (struct device *dev, struct device_driver *dr
        return 0;
 }
 
-static int usb_serial_device_probe (struct device *dev)
+static ssize_t show_port_number(struct device *dev,
+                               struct device_attribute *attr, char *buf)
+{
+       struct usb_serial_port *port = to_usb_serial_port(dev);
+
+       return sprintf(buf, "%d\n", port->number - port->serial->minor);
+}
+
+static DEVICE_ATTR(port_number, S_IRUGO, show_port_number, NULL);
+
+static int usb_serial_device_probe(struct device *dev)
 {
        struct usb_serial_driver *driver;
        struct usb_serial_port *port;
@@ -56,15 +67,19 @@ static int usb_serial_device_probe (struct device *dev)
                        retval = -EIO;
                        goto exit;
                }
-               retval = driver->port_probe (port);
+               retval = driver->port_probe(port);
                module_put(driver->driver.owner);
                if (retval)
                        goto exit;
        }
 
+       retval = device_create_file(dev, &dev_attr_port_number);
+       if (retval)
+               goto exit;
+
        minor = port->number;
-       tty_register_device (usb_serial_tty_driver, minor, dev);
-       dev_info(&port->serial->dev->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->description, minor);
 
@@ -72,7 +87,7 @@ exit:
        return retval;
 }
 
-static int usb_serial_device_remove (struct device *dev)
+static int usb_serial_device_remove(struct device *dev)
 {
        struct usb_serial_driver *driver;
        struct usb_serial_port *port;
@@ -80,9 +95,10 @@ static int usb_serial_device_remove (struct device *dev)
        int minor;
 
        port = to_usb_serial_port(dev);
-       if (!port) {
+       if (!port)
                return -ENODEV;
-       }
+
+       device_remove_file(&port->dev, &dev_attr_port_number);
 
        driver = port->serial->type;
        if (driver->port_remove) {
@@ -91,12 +107,12 @@ static int usb_serial_device_remove (struct device *dev)
                        retval = -EIO;
                        goto exit;
                }
-               retval = driver->port_remove (port);
+               retval = driver->port_remove(port);
                module_put(driver->driver.owner);
        }
 exit:
        minor = port->number;
-       tty_unregister_device (usb_serial_tty_driver, minor);
+       tty_unregister_device(usb_serial_tty_driver, minor);
        dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
                 driver->description, minor);
 
@@ -138,7 +154,7 @@ static void free_dynids(struct usb_serial_driver *drv)
 static struct driver_attribute drv_attrs[] = {
        __ATTR_NULL,
 };
-static inline void free_dynids(struct usb_driver *drv)
+static inline void free_dynids(struct usb_serial_driver *drv)
 {
 }
 #endif