Skip to content

Commit d62ccb5

Browse files
lrq-maxtiwai
authored andcommitted
ALSA: virtio: remove duplicate check if queue is broken
virtqueue_enable_cb() will call virtqueue_poll() which will check if queue is broken at beginning, so remove the virtqueue_is_broken() call Signed-off-by: Li RongQing <[email protected]> Reviewed-by: Stefan Hajnoczi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Iwai <[email protected]>
1 parent 7c42985 commit d62ccb5

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

sound/virtio/virtio_card.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ static void virtsnd_event_notify_cb(struct virtqueue *vqueue)
9191
virtsnd_event_dispatch(snd, event);
9292
virtsnd_event_send(vqueue, event, true, GFP_ATOMIC);
9393
}
94-
if (unlikely(virtqueue_is_broken(vqueue)))
95-
break;
9694
} while (!virtqueue_enable_cb(vqueue));
9795
spin_unlock_irqrestore(&queue->lock, flags);
9896
}

sound/virtio/virtio_ctl_msg.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,6 @@ void virtsnd_ctl_notify_cb(struct virtqueue *vqueue)
303303
virtqueue_disable_cb(vqueue);
304304
while ((msg = virtqueue_get_buf(vqueue, &length)))
305305
virtsnd_ctl_msg_complete(msg);
306-
if (unlikely(virtqueue_is_broken(vqueue)))
307-
break;
308306
} while (!virtqueue_enable_cb(vqueue));
309307
spin_unlock_irqrestore(&queue->lock, flags);
310308
}

sound/virtio/virtio_pcm_msg.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,6 @@ static inline void virtsnd_pcm_notify_cb(struct virtio_snd_queue *queue)
358358
virtqueue_disable_cb(queue->vqueue);
359359
while ((msg = virtqueue_get_buf(queue->vqueue, &written_bytes)))
360360
virtsnd_pcm_msg_complete(msg, written_bytes);
361-
if (unlikely(virtqueue_is_broken(queue->vqueue)))
362-
break;
363361
} while (!virtqueue_enable_cb(queue->vqueue));
364362
spin_unlock_irqrestore(&queue->lock, flags);
365363
}

0 commit comments

Comments
 (0)