Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 415d7b3a authored by Johan Hovold's avatar Johan Hovold
Browse files

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: default avatarJohan Hovold <johan@kernel.org>
parent 07814246

drivers/usb/serial/generic.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -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 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 = {

struct usb_serial_driver usb_serial_generic_device = {

	.driver = {

	.driver = {

		.owner =	THIS_MODULE,

		.owner =	THIS_MODULE,
@@ -44,6 +55,7 @@ struct usb_serial_driver usb_serial_generic_device = { 
	},

	},

	.id_table =		generic_device_ids,

	.id_table =		generic_device_ids,

	.num_ports =		1,

	.num_ports =		1,

	.probe =		usb_serial_generic_probe,

	.throttle =		usb_serial_generic_throttle,

	.throttle =		usb_serial_generic_throttle,

	.unthrottle =		usb_serial_generic_unthrottle,

	.unthrottle =		usb_serial_generic_unthrottle,

	.resume =		usb_serial_generic_resume,

	.resume =		usb_serial_generic_resume,

drivers/usb/serial/usb-serial.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -858,8 +858,6 @@ static int usb_serial_probe(struct usb_interface *interface, 
			retval = -EIO;

			retval = -EIO;

			goto err_free_epds;

			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

#endif

	if (!num_ports) {

	if (!num_ports) {