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

Commit 15c17232 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dan Williams
Browse files

ARM: PL08x: rename 'desc_list' as 'pend_list' 



This 'desc_list' is actually a list of pending descriptors, so name
it after its function (pending list) rather than what it contains
(descriptors).

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 3d992e1a

drivers/dma/amba-pl08x.c

+10 −10
Original line number Original line Diff line number Diff line
@@ -348,9 +348,9 @@ static u32 pl08x_getbytes_chan(struct pl08x_dma_chan *plchan) 
	}

	}





	/* Sum up all queued transactions */

	/* Sum up all queued transactions */

	if (!list_empty(&plchan->desc_list)) {

	if (!list_empty(&plchan->pend_list)) {

		struct pl08x_txd *txdi;

		struct pl08x_txd *txdi;

		list_for_each_entry(txdi, &plchan->desc_list, node) {

		list_for_each_entry(txdi, &plchan->pend_list, node) {

			bytes += txdi->len;

			bytes += txdi->len;

		}

		}

	}

	}
@@ -880,9 +880,9 @@ static void pl08x_free_txd_list(struct pl08x_driver_data *pl08x, 
	struct pl08x_txd *txdi = NULL;

	struct pl08x_txd *txdi = NULL;

	struct pl08x_txd *next;

	struct pl08x_txd *next;





	if (!list_empty(&plchan->desc_list)) {

	if (!list_empty(&plchan->pend_list)) {

		list_for_each_entry_safe(txdi,

		list_for_each_entry_safe(txdi,

					 next, &plchan->desc_list, node) {

					 next, &plchan->pend_list, node) {

			list_del(&txdi->node);

			list_del(&txdi->node);

			pl08x_free_txd(pl08x, txdi);

			pl08x_free_txd(pl08x, txdi);

		}

		}
@@ -1183,10 +1183,10 @@ static void pl08x_issue_pending(struct dma_chan *chan) 
	}

	}





	/* Take the first element in the queue and execute it */

	/* Take the first element in the queue and execute it */

	if (!list_empty(&plchan->desc_list)) {

	if (!list_empty(&plchan->pend_list)) {

		struct pl08x_txd *next;

		struct pl08x_txd *next;





		next = list_first_entry(&plchan->desc_list,

		next = list_first_entry(&plchan->pend_list,

					struct pl08x_txd,

					struct pl08x_txd,

					node);

					node);

		list_del(&next->node);

		list_del(&next->node);
@@ -1213,7 +1213,7 @@ static int pl08x_prep_channel_resources(struct pl08x_dma_chan *plchan, 




	spin_lock_irqsave(&plchan->lock, plchan->lockflags);

	spin_lock_irqsave(&plchan->lock, plchan->lockflags);





	list_add_tail(&txd->node, &plchan->desc_list);

	list_add_tail(&txd->node, &plchan->pend_list);





	/*

	/*

	 * See if we already have a physical channel allocated,

	 * See if we already have a physical channel allocated,
@@ -1571,10 +1571,10 @@ static void pl08x_tasklet(unsigned long data) 
	 * If a new descriptor is queued, set it up

	 * If a new descriptor is queued, set it up

	 * plchan->at is NULL here

	 * plchan->at is NULL here

	 */

	 */

	if (!list_empty(&plchan->desc_list)) {

	if (!list_empty(&plchan->pend_list)) {

		struct pl08x_txd *next;

		struct pl08x_txd *next;





		next = list_first_entry(&plchan->desc_list,

		next = list_first_entry(&plchan->pend_list,

					struct pl08x_txd,

					struct pl08x_txd,

					node);

					node);

		list_del(&next->node);

		list_del(&next->node);
@@ -1736,7 +1736,7 @@ static int pl08x_dma_init_virtual_channels(struct pl08x_driver_data *pl08x, 
		chan->lc = 0;

		chan->lc = 0;





		spin_lock_init(&chan->lock);

		spin_lock_init(&chan->lock);

		INIT_LIST_HEAD(&chan->desc_list);

		INIT_LIST_HEAD(&chan->pend_list);

		tasklet_init(&chan->tasklet, pl08x_tasklet,

		tasklet_init(&chan->tasklet, pl08x_tasklet,

			     (unsigned long) chan);

			     (unsigned long) chan);

include/linux/amba/pl08x.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ enum pl08x_dma_chan_state { 
 * @runtime_direction: current direction of this channel according to

 * @runtime_direction: current direction of this channel according to

 * runtime config

 * runtime config

 * @lc: last completed transaction on this channel

 * @lc: last completed transaction on this channel

 * @desc_list: queued transactions pending on this channel

 * @pend_list: queued transactions pending on this channel

 * @at: active transaction on this channel

 * @at: active transaction on this channel

 * @lockflags: sometimes we let a lock last between two function calls,

 * @lockflags: sometimes we let a lock last between two function calls,

 * especially prep/submit, and then we need to store the IRQ flags

 * especially prep/submit, and then we need to store the IRQ flags
@@ -179,7 +179,7 @@ struct pl08x_dma_chan { 
	dma_addr_t runtime_addr;

	dma_addr_t runtime_addr;

	enum dma_data_direction	runtime_direction;

	enum dma_data_direction	runtime_direction;

	dma_cookie_t lc;

	dma_cookie_t lc;

	struct list_head desc_list;

	struct list_head pend_list;

	struct pl08x_txd *at;

	struct pl08x_txd *at;

	unsigned long lockflags;

	unsigned long lockflags;

	spinlock_t lock;

	spinlock_t lock;