aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/generic.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2017-03-16 12:13:31 -0400
committerJohan Hovold <johan@kernel.org>2017-03-28 04:54:39 -0400
commit415d7b3a5407d91fdf47a07fd31d63e4b548651f (patch)
tree03bada184bb316d49d4622b0a5f373231459fa97 /drivers/usb/serial/generic.c
parent07814246dd5530860ef758fd9b2b5f2e26472aa2 (diff)
USB: serial: add probe callback to generic driver
Add a probe callback to the generic driver and print the only-for-testing message there. This is a first step in getting rid of the CONFIG_USB_SERIAL_GENERIC ifdef from usb-serial core. Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/generic.c')
-rw-r--r--drivers/usb/serial/generic.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 49ce2be90fa0..8c7600472019 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -37,6 +37,17 @@ MODULE_PARM_DESC(product, "User specified USB idProduct");
37 37
38static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ 38static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
39 39
40static int usb_serial_generic_probe(struct usb_serial *serial,
41 const struct usb_device_id *id)
42{
43 struct device *dev = &serial->interface->dev;
44
45 dev_info(dev, "The \"generic\" usb-serial driver is only for testing and one-off prototypes.\n");
46 dev_info(dev, "Tell linux-usb@vger.kernel.org to add your device to a proper driver.\n");
47
48 return 0;
49}
50
40struct usb_serial_driver usb_serial_generic_device = { 51struct usb_serial_driver usb_serial_generic_device = {
41 .driver = { 52 .driver = {
42 .owner = THIS_MODULE, 53 .owner = THIS_MODULE,
@@ -44,6 +55,7 @@ struct usb_serial_driver usb_serial_generic_device = {
44 }, 55 },
45 .id_table = generic_device_ids, 56 .id_table = generic_device_ids,
46 .num_ports = 1, 57 .num_ports = 1,
58 .probe = usb_serial_generic_probe,
47 .throttle = usb_serial_generic_throttle, 59 .throttle = usb_serial_generic_throttle,
48 .unthrottle = usb_serial_generic_unthrottle, 60 .unthrottle = usb_serial_generic_unthrottle,
49 .resume = usb_serial_generic_resume, 61 .resume = usb_serial_generic_resume,