USB: serial: cyberjack: simplify endpoint check
authorJohan Hovold <johan@kernel.org>
Thu, 2 Mar 2017 11:51:21 +0000 (12:51 +0100)
committerJohan Hovold <johan@kernel.org>
Thu, 16 Mar 2017 09:33:42 +0000 (10:33 +0100)
Simplify the endpoint sanity check by letting core verify that the
required endpoints are present.

Signed-off-by: Johan Hovold <johan@kernel.org>
drivers/usb/serial/cyberjack.c

index 80260b08398b2e55833c65d21e0be70cc43ccf01..47fbd9f0c0c7a8508f23b562f4a220dbd19bc33f 100644 (file)
@@ -50,7 +50,6 @@
 #define CYBERJACK_PRODUCT_ID   0x0100
 
 /* Function prototypes */
-static int cyberjack_attach(struct usb_serial *serial);
 static int cyberjack_port_probe(struct usb_serial_port *port);
 static int cyberjack_port_remove(struct usb_serial_port *port);
 static int  cyberjack_open(struct tty_struct *tty,
@@ -78,7 +77,7 @@ static struct usb_serial_driver cyberjack_device = {
        .description =          "Reiner SCT Cyberjack USB card reader",
        .id_table =             id_table,
        .num_ports =            1,
-       .attach =               cyberjack_attach,
+       .num_bulk_out =         1,
        .port_probe =           cyberjack_port_probe,
        .port_remove =          cyberjack_port_remove,
        .open =                 cyberjack_open,
@@ -102,14 +101,6 @@ struct cyberjack_private {
        short           wrsent;         /* Data already sent */
 };
 
-static int cyberjack_attach(struct usb_serial *serial)
-{
-       if (serial->num_bulk_out < serial->num_ports)
-               return -ENODEV;
-
-       return 0;
-}
-
 static int cyberjack_port_probe(struct usb_serial_port *port)
 {
        struct cyberjack_private *priv;