cdc-acm: Drop the warning for unusual capabilities

Let's drop the warning for modems with unusual capabilities,
the associated quirk and blacklist. They made little sense.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index e934e19f49f57e3e463c31c65caa76cca3fee905..a78a7a4560c8316dfe70b58b916c334125032e63 100644 (file)
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1144,8 +1144,6 @@ static int acm_probe(struct usb_interface *intf,
                case USB_CDC_CALL_MANAGEMENT_TYPE:
                        call_management_function = buffer[3];
                        call_interface_num = buffer[4];
-                       if ((quirks & NOT_A_MODEM) == 0 && (call_management_function & 3) != 3)
-                               dev_err(&intf->dev, "This device cannot do calls on its own. It is not a modem.\n");
                        break;
                default:
                        /* there are LOTS more CDC descriptors that
@@ -1796,11 +1794,6 @@ static const struct usb_device_id acm_ids[] = {
 
        /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
 
-       /* Support Lego NXT using pbLua firmware */
-       { USB_DEVICE(0x0694, 0xff00),
-       .driver_info = NOT_A_MODEM,
-       },
-
        /* Support for Droids MuIn LCD */
        { USB_DEVICE(0x04d8, 0x000b),
        .driver_info = NO_DATA_INTERFACE,

diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index fc75651afe1c9cda8983aa82dfa8b81cfa3fb5bf..8cd2c4b0b8ff7dc8d128acbf087e9c5b5d2292c9 100644 (file)
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -129,6 +129,5 @@ struct acm {
 #define NO_UNION_NORMAL                        BIT(0)
 #define SINGLE_RX_URB                  BIT(1)
 #define NO_CAP_LINE                    BIT(2)
-#define NOT_A_MODEM                    BIT(3)
 #define NO_DATA_INTERFACE              BIT(4)
 #define IGNORE_DEVICE                  BIT(5)