Commit e351c4d0 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Stefan Richter

ieee1394: Use shorter list_splice_init() for brevity.

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent b1ce1fd7
...@@ -2089,10 +2089,8 @@ static void dma_trm_reset(struct dma_trm_ctx *d) ...@@ -2089,10 +2089,8 @@ static void dma_trm_reset(struct dma_trm_ctx *d)
spin_lock_irqsave(&d->lock, flags); spin_lock_irqsave(&d->lock, flags);
list_splice(&d->fifo_list, &packet_list); list_splice_init(&d->fifo_list, &packet_list);
list_splice(&d->pending_list, &packet_list); list_splice_init(&d->pending_list, &packet_list);
INIT_LIST_HEAD(&d->fifo_list);
INIT_LIST_HEAD(&d->pending_list);
d->branchAddrPtr = NULL; d->branchAddrPtr = NULL;
d->sent_ind = d->prg_ind; d->sent_ind = d->prg_ind;
......
...@@ -738,8 +738,7 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg) ...@@ -738,8 +738,7 @@ static int lynx_devctl(struct hpsb_host *host, enum devctl_cmd cmd, int arg)
spin_lock_irqsave(&lynx->async.queue_lock, flags); spin_lock_irqsave(&lynx->async.queue_lock, flags);
reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0); reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0);
list_splice(&lynx->async.queue, &packet_list); list_splice_init(&lynx->async.queue, &packet_list);
INIT_LIST_HEAD(&lynx->async.queue);
if (list_empty(&lynx->async.pcl_queue)) { if (list_empty(&lynx->async.pcl_queue)) {
spin_unlock_irqrestore(&lynx->async.queue_lock, flags); spin_unlock_irqrestore(&lynx->async.queue_lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment