Commit 319bb4a7 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: cdc-acm: use common data-class define 



Use the data-class define provided by USB core and drop the
driver-specific one.

Acked-by: default avatarOliver Neukum <oneukum@suse.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20200921135951.24045-4-johan@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 960c7339

drivers/usb/class/cdc-acm.c

+2 −4
Original line number Diff line number Diff line
@@ -1288,10 +1288,8 @@ look_for_collapsed_interface: 
skip_normal_probe:



	/*workaround for switched interfaces */

	if (data_interface->cur_altsetting->desc.bInterfaceClass

						!= CDC_DATA_INTERFACE_TYPE) {

		if (control_interface->cur_altsetting->desc.bInterfaceClass

						== CDC_DATA_INTERFACE_TYPE) {

	if (data_interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA) {

		if (control_interface->cur_altsetting->desc.bInterfaceClass == USB_CLASS_CDC_DATA) {

			dev_dbg(&intf->dev,

				"Your device has switched interfaces.\n");

			swap(control_interface, data_interface);

drivers/usb/class/cdc-acm.h

+0 −2
Original line number Diff line number Diff line
@@ -131,8 +131,6 @@ struct acm { 
	unsigned long quirks;

};



#define CDC_DATA_INTERFACE_TYPE	0x0a



/* constants describing various quirks and errors */

#define NO_UNION_NORMAL			BIT(0)

#define SINGLE_RX_URB			BIT(1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE