Commit ce8e5f20 authored by Ruslan Bilovol's avatar Ruslan Bilovol Committed by Takashi Iwai
Browse files

ALSA: usb-audio: remove Wireless USB dead code 



Wireless USB host controller support has been removed
from Linux Kernel more than 3 years ago in commit
caa6772d ("Staging: remove wusbcore and UWB from the
kernel tree."), and the associated code in the
snd-usb-audio driver became unused and untested.

If in the future somebody will return WUSB/UWB support
back to the kernel, the snd-usb-audio driver will reject
Wireless USB audio devices at probe stage, and this patch
should be reverted.

Signed-off-by: default avatarRuslan Bilovol <ruslan.bilovol@gmail.com>
Link: https://lore.kernel.org/r/20230312222857.296623-1-ruslan.bilovol@gmail.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1a0cc052

sound/usb/card.c

+0 −1
Original line number Diff line number Diff line
@@ -609,7 +609,6 @@ static int snd_usb_audio_create(struct usb_interface *intf, 
	case USB_SPEED_LOW:

	case USB_SPEED_FULL:

	case USB_SPEED_HIGH:

	case USB_SPEED_WIRELESS:

	case USB_SPEED_SUPER:

	case USB_SPEED_SUPER_PLUS:

		break;

sound/usb/endpoint.c

+1 −15
Original line number Diff line number Diff line
@@ -1173,22 +1173,8 @@ static int data_ep_set_params(struct snd_usb_endpoint *ep) 
	 */

	if (usb_pipein(ep->pipe) || ep->implicit_fb_sync) {



		urb_packs = packs_per_ms;

		/*

		 * Wireless devices can poll at a max rate of once per 4ms.

		 * For dataintervals less than 5, increase the packet count to

		 * allow the host controller to use bursting to fill in the

		 * gaps.

		 */

		if (snd_usb_get_speed(chip->dev) == USB_SPEED_WIRELESS) {

			int interval = ep->datainterval;

			while (interval < 5) {

				urb_packs <<= 1;

				++interval;

			}

		}

		/* make capture URBs <= 1 ms and smaller than a period */

		urb_packs = min(max_packs_per_urb, urb_packs);

		urb_packs = min(max_packs_per_urb, packs_per_ms);

		while (urb_packs > 1 && urb_packs * maxsize >= ep->cur_period_bytes)

			urb_packs >>= 1;

		ep->nurbs = MAX_URBS;

sound/usb/helper.c

+0 −1
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ unsigned char snd_usb_parse_datainterval(struct snd_usb_audio *chip, 
{

	switch (snd_usb_get_speed(chip->dev)) {

	case USB_SPEED_HIGH:

	case USB_SPEED_WIRELESS:

	case USB_SPEED_SUPER:

	case USB_SPEED_SUPER_PLUS:

		if (get_endpoint(alts, 0)->bInterval >= 1 &&