diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2009-04-30 09:23:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:25 -0400 |
commit | f7a386c5b8ff34cd84ae922603d1c6f9d234edee (patch) | |
tree | ae1c03544dd511d85cc537c632eba6f035072e36 /drivers/hid | |
parent | d405640539555b601e52f7d18f1f0b1345d18bf5 (diff) |
Driver Core: usb: add nodename support for usb drivers.
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>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/usbhid/hiddev.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c index e9b436d2d944..9e9421525fb9 100644 --- a/drivers/hid/usbhid/hiddev.c +++ b/drivers/hid/usbhid/hiddev.c | |||
@@ -850,8 +850,14 @@ static const struct file_operations hiddev_fops = { | |||
850 | #endif | 850 | #endif |
851 | }; | 851 | }; |
852 | 852 | ||
853 | static char *hiddev_nodename(struct device *dev) | ||
854 | { | ||
855 | return kasprintf(GFP_KERNEL, "usb/%s", dev_name(dev)); | ||
856 | } | ||
857 | |||
853 | static struct usb_class_driver hiddev_class = { | 858 | static struct usb_class_driver hiddev_class = { |
854 | .name = "hiddev%d", | 859 | .name = "hiddev%d", |
860 | .nodename = hiddev_nodename, | ||
855 | .fops = &hiddev_fops, | 861 | .fops = &hiddev_fops, |
856 | .minor_base = HIDDEV_MINOR_BASE, | 862 | .minor_base = HIDDEV_MINOR_BASE, |
857 | }; | 863 | }; |
@@ -955,7 +961,6 @@ static int hiddev_usbd_probe(struct usb_interface *intf, | |||
955 | return -ENODEV; | 961 | return -ENODEV; |
956 | } | 962 | } |
957 | 963 | ||
958 | |||
959 | static /* const */ struct usb_driver hiddev_driver = { | 964 | static /* const */ struct usb_driver hiddev_driver = { |
960 | .name = "hiddev", | 965 | .name = "hiddev", |
961 | .probe = hiddev_usbd_probe, | 966 | .probe = hiddev_usbd_probe, |