diff options
| author | Johan Hovold <johan@kernel.org> | 2017-03-16 17:13:31 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2017-03-28 10:54:39 +0200 |
| commit | 415d7b3a5407d91fdf47a07fd31d63e4b548651f (patch) | |
| tree | 03bada184bb316d49d4622b0a5f373231459fa97 /drivers/usb | |
| parent | 07814246dd5530860ef758fd9b2b5f2e26472aa2 (diff) | |
| download | linux-stable-415d7b3a5407d91fdf47a07fd31d63e4b548651f.tar.gz linux-stable-415d7b3a5407d91fdf47a07fd31d63e4b548651f.tar.bz2 linux-stable-415d7b3a5407d91fdf47a07fd31d63e4b548651f.zip | |
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')
| -rw-r--r-- | drivers/usb/serial/generic.c | 12 | ||||
| -rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 |
2 files changed, 12 insertions, 2 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"); static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */ +static int usb_serial_generic_probe(struct usb_serial *serial, + const struct usb_device_id *id) +{ + struct device *dev = &serial->interface->dev; + + dev_info(dev, "The \"generic\" usb-serial driver is only for testing and one-off prototypes.\n"); + dev_info(dev, "Tell linux-usb@vger.kernel.org to add your device to a proper driver.\n"); + + return 0; +} + struct usb_serial_driver usb_serial_generic_device = { .driver = { .owner = THIS_MODULE, @@ -44,6 +55,7 @@ struct usb_serial_driver usb_serial_generic_device = { }, .id_table = generic_device_ids, .num_ports = 1, + .probe = usb_serial_generic_probe, .throttle = usb_serial_generic_throttle, .unthrottle = usb_serial_generic_unthrottle, .resume = usb_serial_generic_resume, diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index f0761f491c5f..f8ae09e2cff5 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c @@ -858,8 +858,6 @@ static int usb_serial_probe(struct usb_interface *interface, retval = -EIO; goto err_free_epds; } - dev_info(ddev, "The \"generic\" usb-serial driver is only for testing and one-off prototypes.\n"); - dev_info(ddev, "Tell linux-usb@vger.kernel.org to add your device to a proper driver.\n"); } #endif if (!num_ports) { |