542a086ac7
Here's the big driver core pull request for 3.12-rc1. Lots of tiny changes here fixing up the way sysfs attributes are created, to try to make drivers simpler, and fix a whole class race conditions with creations of device attributes after the device was announced to userspace. All the various pieces are acked by the different subsystem maintainers. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.21 (GNU/Linux) iEYEABECAAYFAlIlIPcACgkQMUfUDdst+ynUMwCaAnITsxyDXYQ4DqEsz8EcOtMk 718AoLrgnUZs3B+70AT34DVktg4HSThk =USl9 -----END PGP SIGNATURE----- Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Pull driver core patches from Greg KH: "Here's the big driver core pull request for 3.12-rc1. Lots of tiny changes here fixing up the way sysfs attributes are created, to try to make drivers simpler, and fix a whole class race conditions with creations of device attributes after the device was announced to userspace. All the various pieces are acked by the different subsystem maintainers" * tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (119 commits) firmware loader: fix pending_fw_head list corruption drivers/base/memory.c: introduce help macro to_memory_block dynamic debug: line queries failing due to uninitialized local variable sysfs: sysfs_create_groups returns a value. debugfs: provide debugfs_create_x64() when disabled rbd: convert bus code to use bus_groups firmware: dcdbas: use binary attribute groups sysfs: add sysfs_create/remove_groups for when SYSFS is not enabled driver core: add #include <linux/sysfs.h> to core files. HID: convert bus code to use dev_groups Input: serio: convert bus code to use drv_groups Input: gameport: convert bus code to use drv_groups driver core: firmware: use __ATTR_RW() driver core: core: use DEVICE_ATTR_RO driver core: bus: use DRIVER_ATTR_WO() driver core: create write-only attribute macros for devices and drivers sysfs: create __ATTR_WO() driver-core: platform: convert bus code to use dev_groups workqueue: convert bus code to use dev_groups MEI: convert bus code to use dev_groups ...
190 lines
4.4 KiB
C
190 lines
4.4 KiB
C
/*
|
|
* USB Serial Converter Bus specific functions
|
|
*
|
|
* Copyright (C) 2002 Greg Kroah-Hartman (greg@kroah.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License version
|
|
* 2 as published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/module.h>
|
|
#include <linux/usb.h>
|
|
#include <linux/usb/serial.h>
|
|
|
|
static int usb_serial_device_match(struct device *dev,
|
|
struct device_driver *drv)
|
|
{
|
|
struct usb_serial_driver *driver;
|
|
const struct usb_serial_port *port;
|
|
|
|
/*
|
|
* drivers are already assigned to ports in serial_probe so it's
|
|
* a simple check here.
|
|
*/
|
|
port = to_usb_serial_port(dev);
|
|
if (!port)
|
|
return 0;
|
|
|
|
driver = to_usb_serial_driver(drv);
|
|
|
|
if (driver == port->serial->type)
|
|
return 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static ssize_t port_number_show(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->port_number);
|
|
}
|
|
static DEVICE_ATTR_RO(port_number);
|
|
|
|
static int usb_serial_device_probe(struct device *dev)
|
|
{
|
|
struct usb_serial_driver *driver;
|
|
struct usb_serial_port *port;
|
|
int retval = 0;
|
|
int minor;
|
|
|
|
port = to_usb_serial_port(dev);
|
|
if (!port) {
|
|
retval = -ENODEV;
|
|
goto exit;
|
|
}
|
|
|
|
/* make sure suspend/resume doesn't race against port_probe */
|
|
retval = usb_autopm_get_interface(port->serial->interface);
|
|
if (retval)
|
|
goto exit;
|
|
|
|
driver = port->serial->type;
|
|
if (driver->port_probe) {
|
|
retval = driver->port_probe(port);
|
|
if (retval)
|
|
goto exit_with_autopm;
|
|
}
|
|
|
|
retval = device_create_file(dev, &dev_attr_port_number);
|
|
if (retval) {
|
|
if (driver->port_remove)
|
|
retval = driver->port_remove(port);
|
|
goto exit_with_autopm;
|
|
}
|
|
|
|
minor = port->minor;
|
|
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);
|
|
|
|
exit_with_autopm:
|
|
usb_autopm_put_interface(port->serial->interface);
|
|
exit:
|
|
return retval;
|
|
}
|
|
|
|
static int usb_serial_device_remove(struct device *dev)
|
|
{
|
|
struct usb_serial_driver *driver;
|
|
struct usb_serial_port *port;
|
|
int retval = 0;
|
|
int minor;
|
|
|
|
port = to_usb_serial_port(dev);
|
|
if (!port)
|
|
return -ENODEV;
|
|
|
|
/* make sure suspend/resume doesn't race against port_remove */
|
|
usb_autopm_get_interface(port->serial->interface);
|
|
|
|
minor = port->minor;
|
|
tty_unregister_device(usb_serial_tty_driver, minor);
|
|
|
|
device_remove_file(&port->dev, &dev_attr_port_number);
|
|
|
|
driver = port->serial->type;
|
|
if (driver->port_remove)
|
|
retval = driver->port_remove(port);
|
|
|
|
dev_info(dev, "%s converter now disconnected from ttyUSB%d\n",
|
|
driver->description, minor);
|
|
|
|
usb_autopm_put_interface(port->serial->interface);
|
|
return retval;
|
|
}
|
|
|
|
static ssize_t new_id_store(struct device_driver *driver,
|
|
const char *buf, size_t count)
|
|
{
|
|
struct usb_serial_driver *usb_drv = to_usb_serial_driver(driver);
|
|
ssize_t retval = usb_store_new_id(&usb_drv->dynids, driver, buf, count);
|
|
|
|
if (retval >= 0 && usb_drv->usb_driver != NULL)
|
|
retval = usb_store_new_id(&usb_drv->usb_driver->dynids,
|
|
&usb_drv->usb_driver->drvwrap.driver,
|
|
buf, count);
|
|
return retval;
|
|
}
|
|
|
|
static ssize_t new_id_show(struct device_driver *driver, char *buf)
|
|
{
|
|
struct usb_serial_driver *usb_drv = to_usb_serial_driver(driver);
|
|
|
|
return usb_show_dynids(&usb_drv->dynids, buf);
|
|
}
|
|
static DRIVER_ATTR_RW(new_id);
|
|
|
|
static struct attribute *usb_serial_drv_attrs[] = {
|
|
&driver_attr_new_id.attr,
|
|
NULL,
|
|
};
|
|
ATTRIBUTE_GROUPS(usb_serial_drv);
|
|
|
|
static void free_dynids(struct usb_serial_driver *drv)
|
|
{
|
|
struct usb_dynid *dynid, *n;
|
|
|
|
spin_lock(&drv->dynids.lock);
|
|
list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) {
|
|
list_del(&dynid->node);
|
|
kfree(dynid);
|
|
}
|
|
spin_unlock(&drv->dynids.lock);
|
|
}
|
|
|
|
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,
|
|
.drv_groups = usb_serial_drv_groups,
|
|
};
|
|
|
|
int usb_serial_bus_register(struct usb_serial_driver *driver)
|
|
{
|
|
int retval;
|
|
|
|
driver->driver.bus = &usb_serial_bus_type;
|
|
spin_lock_init(&driver->dynids.lock);
|
|
INIT_LIST_HEAD(&driver->dynids.list);
|
|
|
|
retval = driver_register(&driver->driver);
|
|
|
|
return retval;
|
|
}
|
|
|
|
void usb_serial_bus_deregister(struct usb_serial_driver *driver)
|
|
{
|
|
free_dynids(driver);
|
|
driver_unregister(&driver->driver);
|
|
}
|
|
|