leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: usb-audio: Avoid superfluous usb_set_interface() calls

Browse Source 
This is a preliminary change for the upcoming quirk implementation.

Currently USB-audio driver tries to call usb_set_interface() whenever
the format change with interface/altset modification happens.  In this
patch, the check is replaced with the comparison of cur_altsetting and
the targeted altsetting pointer, so that the driver may skip the
unnecessary function calls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-05-02 09:36:28 +02:00
parent 964af639ad
commit b099b9693d
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/usb/pcm.c
View File

@ -499,7 +499,7 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
iface = usb_ifnum_to_if(dev, fmt->iface); iface = usb_ifnum_to_if(dev, fmt->iface);
if (WARN_ON(!iface)) if (WARN_ON(!iface))
return -EINVAL; return -EINVAL;
alts = &iface->altsetting[fmt->altset_idx]; alts = usb_altnum_to_altsetting(iface, fmt->altsetting);
altsd = get_iface_desc(alts); altsd = get_iface_desc(alts);
if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting)) if (WARN_ON(altsd->bAlternateSetting != fmt->altsetting))
return -EINVAL; return -EINVAL;
@ -521,9 +521,7 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
} }
/* set interface */ /* set interface */
if (subs->interface != fmt->iface || if (iface->cur_altsetting != alts) {
subs->altset_idx != fmt->altset_idx) {
err = snd_usb_select_mode_quirk(subs, fmt); err = snd_usb_select_mode_quirk(subs, fmt);
if (err < 0) if (err < 0)
return -EIO; return -EIO;
@ -537,12 +535,11 @@ static int set_format(struct snd_usb_substream *subs, struct audioformat *fmt)
} }
dev_dbg(&dev->dev, "setting usb interface %d:%d\n", dev_dbg(&dev->dev, "setting usb interface %d:%d\n",
fmt->iface, fmt->altsetting); fmt->iface, fmt->altsetting);
subs->interface = fmt->iface;
subs->altset_idx = fmt->altset_idx;
snd_usb_set_interface_quirk(dev); snd_usb_set_interface_quirk(dev);
} }
subs->interface = fmt->iface;
subs->altset_idx = fmt->altset_idx;
subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip, subs->data_endpoint = snd_usb_add_endpoint(subs->stream->chip,
alts, fmt->endpoint, subs->direction, alts, fmt->endpoint, subs->direction,
SND_USB_ENDPOINT_TYPE_DATA); SND_USB_ENDPOINT_TYPE_DATA);