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

Commit 6aa2731c authored by Dan Williams's avatar Dan Williams
Browse files

dma: fix build warnings in ppc4xx 



drivers/dma/ppc4xx/adma.c:1507:6: warning: unused variable 'i' [-Wunused-variable]
- due to unmap reworks

drivers/dma/ppc4xx/adma.c:3900:2: warning: format '%s' expects a matching 'char *' argument [-Wformat]
- due to memset removal

drivers/dma/ppc4xx/adma.c:538:13: warning: 'ppc440spe_desc_init_memset' defined but not used [-Wunused-function]
- due to memset removal

Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d7fb0300

drivers/dma/ppc4xx/adma.c

+1 −26
Original line number Diff line number Diff line
@@ -532,29 +532,6 @@ static void ppc440spe_desc_init_memcpy(struct ppc440spe_adma_desc_slot *desc, 
	hw_desc->opc = DMA_CDB_OPC_MV_SG1_SG2;

}



/**

 * ppc440spe_desc_init_memset - initialize the descriptor for MEMSET operation

 */

static void ppc440spe_desc_init_memset(struct ppc440spe_adma_desc_slot *desc,

					int value, unsigned long flags)

{

	struct dma_cdb *hw_desc = desc->hw_desc;



	memset(desc->hw_desc, 0, sizeof(struct dma_cdb));

	desc->hw_next = NULL;

	desc->src_cnt = 1;

	desc->dst_cnt = 1;



	if (flags & DMA_PREP_INTERRUPT)

		set_bit(PPC440SPE_DESC_INT, &desc->flags);

	else

		clear_bit(PPC440SPE_DESC_INT, &desc->flags);



	hw_desc->sg1u = hw_desc->sg1l = cpu_to_le32((u32)value);

	hw_desc->sg3u = hw_desc->sg3l = cpu_to_le32((u32)value);

	hw_desc->opc = DMA_CDB_OPC_DFILL128;

}



/**

 * ppc440spe_desc_set_src_addr - set source address into the descriptor

 */
@@ -1504,8 +1481,6 @@ static dma_cookie_t ppc440spe_adma_run_tx_complete_actions( 
		struct ppc440spe_adma_chan *chan,

		dma_cookie_t cookie)

{

	int i;



	BUG_ON(desc->async_tx.cookie < 0);

	if (desc->async_tx.cookie > 0) {

		cookie = desc->async_tx.cookie;
@@ -3898,7 +3873,7 @@ static void ppc440spe_adma_init_capabilities(struct ppc440spe_adma_device *adev) 
			ppc440spe_adma_prep_dma_interrupt;

	}

	pr_info("%s: AMCC(R) PPC440SP(E) ADMA Engine: "

	  "( %s%s%s%s%s%s%s)\n",

	  "( %s%s%s%s%s%s)\n",

	  dev_name(adev->dev),

	  dma_has_cap(DMA_PQ, adev->common.cap_mask) ? "pq " : "",

	  dma_has_cap(DMA_PQ_VAL, adev->common.cap_mask) ? "pq_val " : "",