ALSA: usb-audio: do not initialize and check implicit_fb
authorEldad Zack <eldad@fogrefinery.com>
Sat, 3 Aug 2013 08:50:20 +0000 (10:50 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 6 Aug 2013 08:51:11 +0000 (10:51 +0200)
Since implicit_fb is not changed, !implicit_fb will always
be true - it is set only after these checks.
Similarly, there's also no need to set it at the top of the function.

Change the type of implicit_fb to bool (more appropriate).

Signed-off-by: Eldad Zack <eldad@fogrefinery.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/usb/pcm.c

index c31dbdc091786b2afa34ff5145640351e6c93094..bb2e0f52e92f428b3fa574e81cd5064e500e8f22 100644 (file)
@@ -405,7 +405,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
 {
        int is_playback = subs->direction == SNDRV_PCM_STREAM_PLAYBACK;
        unsigned int ep, attr;
-       int implicit_fb = 0;
+       bool implicit_fb;
        int err;
 
        /* we need a sync pipe in async OUT or adaptive IN mode */
@@ -432,8 +432,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
           the audio fields in the endpoint descriptors */
        if ((get_endpoint(alts, 1)->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK) != USB_ENDPOINT_XFER_ISOC ||
            (get_endpoint(alts, 1)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
-            get_endpoint(alts, 1)->bSynchAddress != 0 &&
-            !implicit_fb)) {
+            get_endpoint(alts, 1)->bSynchAddress != 0)) {
                snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. bmAttributes %02x, bLength %d, bSynchAddress %02x\n",
                           dev->devnum, fmt->iface, fmt->altsetting,
                           get_endpoint(alts, 1)->bmAttributes,
@@ -442,8 +441,7 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
                return -EINVAL;
        }
        ep = get_endpoint(alts, 1)->bEndpointAddress;
-       if (!implicit_fb &&
-           get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
+       if (get_endpoint(alts, 0)->bLength >= USB_DT_ENDPOINT_AUDIO_SIZE &&
            ((is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress | USB_DIR_IN)) ||
             (!is_playback && ep != (unsigned int)(get_endpoint(alts, 0)->bSynchAddress & ~USB_DIR_IN)))) {
                snd_printk(KERN_ERR "%d:%d:%d : invalid sync pipe. is_playback %d, ep %02x, bSynchAddress %02x\n",