Commit df23a246 authored by Eldad Zack's avatar Eldad Zack Committed by Takashi Iwai
Browse files

ALSA: usb-audio: rename alt_idx to altsetting 



As Clemens Ladisch kindly explained:
 "Please note that there are two methods to identify alternate settings:
  the number, which is the value in bAlternateSetting, and the index,
  which is the index in the descriptor array.  There might be some wording
  in the USB spec that these two values must be the same, but in reality,
  [insert standard rant about firmware writers], bAlternateSetting
  must be treated as a random ID value."

This patch changes the name to express the correct usage semantics.
No functional change.

Signed-off-by: default avatarEldad Zack <eldad@fogrefinery.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 06613f54

sound/usb/card.h

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct snd_usb_endpoint { 
	unsigned int syncinterval;	/* P for adaptive mode, 0 otherwise */

	unsigned char silence_value;

	unsigned int stride;

	int iface, alt_idx;

	int iface, altsetting;

	int skip_packets;		/* quirks for devices to ignore the first n packets

					   in a stream */

sound/usb/endpoint.c

+3 −3
Original line number Diff line number Diff line
@@ -426,9 +426,9 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip, 
	list_for_each_entry(ep, &chip->ep_list, list) {

		if (ep->ep_num == ep_num &&

		    ep->iface == alts->desc.bInterfaceNumber &&

		    ep->alt_idx == alts->desc.bAlternateSetting) {

		    ep->altsetting == alts->desc.bAlternateSetting) {

			snd_printdd(KERN_DEBUG "Re-using EP %x in iface %d,%d @%p\n",

					ep_num, ep->iface, ep->alt_idx, ep);

					ep_num, ep->iface, ep->altsetting, ep);

			goto __exit_unlock;

		}

	}
@@ -447,7 +447,7 @@ struct snd_usb_endpoint *snd_usb_add_endpoint(struct snd_usb_audio *chip, 
	ep->type = type;

	ep->ep_num = ep_num;

	ep->iface = alts->desc.bInterfaceNumber;

	ep->alt_idx = alts->desc.bAlternateSetting;

	ep->altsetting = alts->desc.bAlternateSetting;

	INIT_LIST_HEAD(&ep->ready_playback_urbs);

	ep_num &= USB_ENDPOINT_NUMBER_MASK;

sound/usb/pcm.c

+3 −3
Original line number Diff line number Diff line
@@ -241,17 +241,17 @@ static int start_endpoints(struct snd_usb_substream *subs, bool can_sleep) 
		struct snd_usb_endpoint *ep = subs->sync_endpoint;



		if (subs->data_endpoint->iface != subs->sync_endpoint->iface ||

		    subs->data_endpoint->alt_idx != subs->sync_endpoint->alt_idx) {

		    subs->data_endpoint->altsetting != subs->sync_endpoint->altsetting) {

			err = usb_set_interface(subs->dev,

						subs->sync_endpoint->iface,

						subs->sync_endpoint->alt_idx);

						subs->sync_endpoint->altsetting);

			if (err < 0) {

				clear_bit(SUBSTREAM_FLAG_SYNC_EP_STARTED, &subs->flags);

				snd_printk(KERN_ERR

					   "%d:%d:%d: cannot set interface (%d)\n",

					   subs->dev->devnum,

					   subs->sync_endpoint->iface,

					   subs->sync_endpoint->alt_idx, err);

					   subs->sync_endpoint->altsetting, err);

				return -EIO;

			}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE