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

Commit c8473828 authored by Olof Johansson's avatar Olof Johansson Committed by Vinod Koul
Browse files

dma: pl330: fix a couple of compilation warnings 



Move a couple of tests and do a minor refactor to avoid:

drivers/dma/pl330.c: In function 'pl330_probe':
drivers/dma/pl330.c:2929:215: warning: comparison of distinct pointer types lacks a cast [enabled by default]
drivers/dma/pl330.c: In function 'pl330_tasklet':
drivers/dma/pl330.c:2250:8: warning: 'pch' may be used uninitialized in this function [-Wuninitialized]
drivers/dma/pl330.c:2228:25: note: 'pch' was declared here
drivers/dma/pl330.c:2277:130: warning: 'pch' may be used uninitialized in this function [-Wuninitialized]
drivers/dma/pl330.c:2260:25: note: 'pch' was declared here

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarVinod Koul <vinod.koul@linux.intel.com>
parent 7e426da8

drivers/dma/pl330.c

+15 −10
Original line number Diff line number Diff line
@@ -2225,12 +2225,9 @@ static inline void free_desc_list(struct list_head *list) 
{

	struct dma_pl330_dmac *pdmac;

	struct dma_pl330_desc *desc;

	struct dma_pl330_chan *pch;

	struct dma_pl330_chan *pch = NULL;

	unsigned long flags;



	if (list_empty(list))

		return;



	/* Finish off the work list */

	list_for_each_entry(desc, list, node) {

		dma_async_tx_callback callback;
@@ -2247,6 +2244,10 @@ static inline void free_desc_list(struct list_head *list) 
		desc->pchan = NULL;

	}



	/* pch will be unset if list was empty */

	if (!pch)

		return;



	pdmac = pch->dmac;



	spin_lock_irqsave(&pdmac->pool_lock, flags);
@@ -2257,12 +2258,9 @@ static inline void free_desc_list(struct list_head *list) 
static inline void handle_cyclic_desc_list(struct list_head *list)

{

	struct dma_pl330_desc *desc;

	struct dma_pl330_chan *pch;

	struct dma_pl330_chan *pch = NULL;

	unsigned long flags;



	if (list_empty(list))

		return;



	list_for_each_entry(desc, list, node) {

		dma_async_tx_callback callback;
@@ -2274,6 +2272,10 @@ static inline void handle_cyclic_desc_list(struct list_head *list) 
			callback(desc->txd.callback_param);

	}



	/* pch will be unset if list was empty */

	if (!pch)

		return;



	spin_lock_irqsave(&pch->lock, flags);

	list_splice_tail_init(list, &pch->work_list);

	spin_unlock_irqrestore(&pch->lock, flags);
@@ -2926,8 +2928,11 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) 
	INIT_LIST_HEAD(&pd->channels);



	/* Initialize channel parameters */

	num_chan = max(pdat ? pdat->nr_valid_peri : (u8)pi->pcfg.num_peri,

			(u8)pi->pcfg.num_chan);

	if (pdat)

		num_chan = max_t(int, pdat->nr_valid_peri, pi->pcfg.num_chan);

	else

		num_chan = max_t(int, pi->pcfg.num_peri, pi->pcfg.num_chan);



	pdmac->peripherals = kzalloc(num_chan * sizeof(*pch), GFP_KERNEL);



	for (i = 0; i < num_chan; i++) {