aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-05-13 06:35:00 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-14 12:30:40 -0400
commitef206f3f01d8cc0d363cfce7dc9ca11db429faa3 (patch)
treef5767b00bf7c34ea96a1450e27b2a8dda68760d9 /drivers/usb/core
parente6bbcef0211ed75db1ca3017551a584aed4e00be (diff)
USB: add read support to usb-serial/../new_id
Keep the usb-serial support for dynamic IDs in sync with the usb support. This enables readout of dynamic device IDs for usb-serial drivers. Common code is exported from the usb core system and reused by the usb-serial bus driver. Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core')
-rw-r--r--drivers/usb/core/driver.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c
index 69919b257775..f6f81c85c5cf 100644
--- a/drivers/usb/core/driver.c
+++ b/drivers/usb/core/driver.c
@@ -79,13 +79,12 @@ ssize_t usb_store_new_id(struct usb_dynids *dynids,
79} 79}
80EXPORT_SYMBOL_GPL(usb_store_new_id); 80EXPORT_SYMBOL_GPL(usb_store_new_id);
81 81
82static ssize_t show_dynids(struct device_driver *driver, char *buf) 82ssize_t usb_show_dynids(struct usb_dynids *dynids, char *buf)
83{ 83{
84 struct usb_dynid *dynid; 84 struct usb_dynid *dynid;
85 struct usb_driver *usb_drv = to_usb_driver(driver);
86 size_t count = 0; 85 size_t count = 0;
87 86
88 list_for_each_entry(dynid, &usb_drv->dynids.list, node) 87 list_for_each_entry(dynid, &dynids->list, node)
89 if (dynid->id.bInterfaceClass != 0) 88 if (dynid->id.bInterfaceClass != 0)
90 count += scnprintf(&buf[count], PAGE_SIZE - count, "%04x %04x %02x\n", 89 count += scnprintf(&buf[count], PAGE_SIZE - count, "%04x %04x %02x\n",
91 dynid->id.idVendor, dynid->id.idProduct, 90 dynid->id.idVendor, dynid->id.idProduct,
@@ -95,6 +94,14 @@ static ssize_t show_dynids(struct device_driver *driver, char *buf)
95 dynid->id.idVendor, dynid->id.idProduct); 94 dynid->id.idVendor, dynid->id.idProduct);
96 return count; 95 return count;
97} 96}
97EXPORT_SYMBOL_GPL(usb_show_dynids);
98
99static ssize_t show_dynids(struct device_driver *driver, char *buf)
100{
101 struct usb_driver *usb_drv = to_usb_driver(driver);
102
103 return usb_show_dynids(&usb_drv->dynids, buf);
104}
98 105
99static ssize_t store_new_id(struct device_driver *driver, 106static ssize_t store_new_id(struct device_driver *driver,
100 const char *buf, size_t count) 107 const char *buf, size_t count)