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

Commit 1a86e156 authored by Bjørn Mork's avatar Bjørn Mork Committed by Greg Kroah-Hartman
Browse files

USB: cdc-wdm: QMI devices are now handled by qmi_wwan 



qmi_wwan has been changed to drive both the control and data
interface for all QMI/wwan devices, using cdc-wdm as a subdriver.
Remove the stale device ID entries from cdc-wdm.

>From now on new QMI/wwan devices will only need to be added to
the qmi_wwan driver, regardless of the USB descriptor layout

Note that this is not appropriate for stable/longterm kernels
despite being a device ID patch.

Cc: Oliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c50f2af8

drivers/usb/class/cdc-wdm.c

+0 −25
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
#define DRIVER_AUTHOR "Oliver Neukum"

#define DRIVER_DESC "USB Abstract Control Model driver for USB WCM Device Management"



#define HUAWEI_VENDOR_ID	0x12D1



static const struct usb_device_id wdm_ids[] = {

	{

		.match_flags = USB_DEVICE_ID_MATCH_INT_CLASS |
@@ -41,29 +39,6 @@ static const struct usb_device_id wdm_ids[] = { 
		.bInterfaceClass = USB_CLASS_COMM,

		.bInterfaceSubClass = USB_CDC_SUBCLASS_DMM

	},

	{

		/* 

		 * Huawei E392, E398 and possibly other Qualcomm based modems

		 * embed the Qualcomm QMI protocol inside CDC on CDC ECM like

		 * control interfaces.  Userspace access to this is required

		 * to configure the accompanying data interface

		 */

		.match_flags        = USB_DEVICE_ID_MATCH_VENDOR |

					USB_DEVICE_ID_MATCH_INT_INFO,

		.idVendor           = HUAWEI_VENDOR_ID,

		.bInterfaceClass    = USB_CLASS_VENDOR_SPEC,

		.bInterfaceSubClass = 1,

		.bInterfaceProtocol = 9, /* NOTE: CDC ECM control interface! */

	},

	{

		 /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */

		.match_flags        = USB_DEVICE_ID_MATCH_VENDOR |

				      USB_DEVICE_ID_MATCH_INT_INFO,

		.idVendor           = HUAWEI_VENDOR_ID,

		.bInterfaceClass    = USB_CLASS_VENDOR_SPEC,

		.bInterfaceSubClass = 1,

		.bInterfaceProtocol = 57, /* NOTE: CDC ECM control interface! */

	},

	{ }

};