lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Driver Core: usb: add nodename support for usb drivers.

Browse Source 
This adds support for USB drivers to report their requested nodename to
userspace.  It also updates a number of USB drivers to provide the
needed subdirectory and device name to be used for them.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers
2009-04-30 15:23:42 +02:00
committed by Greg Kroah-Hartman
parent d405640539
commit f7a386c5b8
8 changed files with 56 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/core/file.c
View File

@ -67,6 +67,16 @@ static struct usb_class {
struct class *class;
} *usb_class;
static char *usb_nodename(struct device *dev)
{
struct usb_class_driver *drv;
drv = dev_get_drvdata(dev);
if (!drv || !drv->nodename)
return NULL;
return drv->nodename(dev);
}
static int init_usb_class(void)
{
int result = 0;
@ -90,6 +100,7 @@ static int init_usb_class(void)
kfree(usb_class);
usb_class = NULL;
}
usb_class->class->nodename = usb_nodename;
exit:
return result;
@ -198,7 +209,7 @@ int usb_register_dev(struct usb_interface *intf,
else
temp = name;
intf->usb_dev = device_create(usb_class->class, &intf->dev,
MKDEV(USB_MAJOR, minor), NULL,
MKDEV(USB_MAJOR, minor), class_driver,
"%s", temp);
if (IS_ERR(intf->usb_dev)) {
down_write(&minor_rwsem);

11
drivers/usb/core/usb.c
View File

@ -305,10 +305,21 @@ static struct dev_pm_ops usb_device_pm_ops = {
#endif /* CONFIG_PM */
static char *usb_nodename(struct device *dev)
{
struct usb_device *usb_dev;
usb_dev = to_usb_device(dev);
return kasprintf(GFP_KERNEL, "bus/usb/%03d/%03d",
usb_dev->bus->busnum, usb_dev->devnum);
}
struct device_type usb_device_type = {
.name = "usb_device",
.release = usb_release_dev,
.uevent = usb_dev_uevent,
.nodename = usb_nodename,
.pm = &usb_device_pm_ops,
};