Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/ieee1394/ohci1394.c

+2 −4
Original line number Diff line number Diff line
@@ -2089,10 +2089,8 @@ static void dma_trm_reset(struct dma_trm_ctx *d) 


	spin_lock_irqsave(&d->lock, flags);



	list_splice(&d->fifo_list, &packet_list);

	list_splice(&d->pending_list, &packet_list);

	INIT_LIST_HEAD(&d->fifo_list);

	INIT_LIST_HEAD(&d->pending_list);

	list_splice_init(&d->fifo_list, &packet_list);

	list_splice_init(&d->pending_list, &packet_list);



	d->branchAddrPtr = NULL;

	d->sent_ind = d->prg_ind;

drivers/ieee1394/pcilynx.c

+1 −2
Original line number Diff line number Diff line
@@ -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);



                reg_write(lynx, DMA_CHAN_CTRL(CHANNEL_ASYNC_SEND), 0);

		list_splice(&lynx->async.queue, &packet_list);

		INIT_LIST_HEAD(&lynx->async.queue);

		list_splice_init(&lynx->async.queue, &packet_list);



                if (list_empty(&lynx->async.pcl_queue)) {

                        spin_unlock_irqrestore(&lynx->async.queue_lock, flags);