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

Commit bdd15443 authored by Johan Hovold's avatar Johan Hovold
Browse files

USB: serial: spcp8x5: simplify endpoint check 



Simplify the endpoint sanity check by letting core verify that the
required endpoints are present.

Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
parent 590298b2

drivers/usb/serial/spcp8x5.c

+2 −14
Original line number Diff line number Diff line
@@ -154,19 +154,6 @@ static int spcp8x5_probe(struct usb_serial *serial, 
	return 0;

}



static int spcp8x5_attach(struct usb_serial *serial)

{

	unsigned char num_ports = serial->num_ports;



	if (serial->num_bulk_in < num_ports ||

			serial->num_bulk_out < num_ports) {

		dev_err(&serial->interface->dev, "missing endpoints\n");

		return -ENODEV;

	}



	return 0;

}



static int spcp8x5_port_probe(struct usb_serial_port *port)

{

	const struct usb_device_id *id = usb_get_serial_data(port->serial);
@@ -488,6 +475,8 @@ static struct usb_serial_driver spcp8x5_device = { 
	},

	.id_table		= id_table,

	.num_ports		= 1,

	.num_bulk_in		= 1,

	.num_bulk_out		= 1,

	.open			= spcp8x5_open,

	.dtr_rts		= spcp8x5_dtr_rts,

	.carrier_raised		= spcp8x5_carrier_raised,
@@ -496,7 +485,6 @@ static struct usb_serial_driver spcp8x5_device = { 
	.tiocmget		= spcp8x5_tiocmget,

	.tiocmset		= spcp8x5_tiocmset,

	.probe			= spcp8x5_probe,

	.attach			= spcp8x5_attach,

	.port_probe		= spcp8x5_port_probe,

	.port_remove		= spcp8x5_port_remove,

};