leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: serial: spcp8x5: simplify endpoint check

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

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2017-03-02 12:51:32 +01:00
parent 590298b223
commit bdd1544360
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/usb/serial/spcp8x5.c
View File

@ -154,19 +154,6 @@ static int spcp8x5_probe(struct usb_serial *serial,
return 0; 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) static int spcp8x5_port_probe(struct usb_serial_port *port)
{ {
const struct usb_device_id *id = usb_get_serial_data(port->serial); 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, .id_table = id_table,
.num_ports = 1, .num_ports = 1,
.num_bulk_in = 1,
.num_bulk_out = 1,
.open = spcp8x5_open, .open = spcp8x5_open,
.dtr_rts = spcp8x5_dtr_rts, .dtr_rts = spcp8x5_dtr_rts,
.carrier_raised = spcp8x5_carrier_raised, .carrier_raised = spcp8x5_carrier_raised,
@ -496,7 +485,6 @@ static struct usb_serial_driver spcp8x5_device = {
.tiocmget = spcp8x5_tiocmget, .tiocmget = spcp8x5_tiocmget,
.tiocmset = spcp8x5_tiocmset, .tiocmset = spcp8x5_tiocmset,
.probe = spcp8x5_probe, .probe = spcp8x5_probe,
.attach = spcp8x5_attach,
.port_probe = spcp8x5_port_probe, .port_probe = spcp8x5_port_probe,
.port_remove = spcp8x5_port_remove, .port_remove = spcp8x5_port_remove,
}; };