Skip to content

Commit

Permalink
usb-serial: show port number in sysfs
Browse files Browse the repository at this point in the history
Some usb-serial devices (e.g. certain Edgeport models) have more than
one serial port on the same USB device/interface.

Currently the only way to distinguish these ports in userspace is by
their minor device number: the driver makes them consecutive and in
stable order.

However, for the purpose of stable naming with udev this is
insufficient: when udev handles the ADD event for one of the ports it
doesn't know what minor number the other one has.

To make stable naming easier, export the port number via sysfs.

Signed-off-by: Roman Kagan <rkagan@sw.ru>
Signed-off-by: Dmitry Guryanov <dimak@dgap.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Roman Kagan authored and Greg Kroah-Hartman committed Oct 12, 2007
1 parent fdf99c9 commit ce0d932
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions drivers/usb/serial/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,16 @@ static int usb_serial_device_match (struct device *dev, struct device_driver *dr
return 0;
}

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;
Expand All @@ -62,6 +72,10 @@ static int usb_serial_device_probe (struct device *dev)
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,
Expand All @@ -84,6 +98,8 @@ static int usb_serial_device_remove (struct device *dev)
return -ENODEV;
}

device_remove_file(&port->dev, &dev_attr_port_number);

driver = port->serial->type;
if (driver->port_remove) {
if (!try_module_get(driver->driver.owner)) {
Expand Down

0 comments on commit ce0d932

Please sign in to comment.