Commit 85726def authored by Dan Williams's avatar Dan Williams Committed by Vinod Koul
Browse files

dma: fix build breakage in s3c24xx-dma 



This driver missed the dma unmap conversion.  Replace
s3c24xx_dma_unmap_buffers with dma_descriptor_unmap.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 89116bf9

drivers/dma/s3c24xx-dma.c

+1 −30
Original line number Diff line number Diff line
@@ -628,42 +628,13 @@ static void s3c24xx_dma_phy_free(struct s3c24xx_dma_chan *s3cchan) 
	s3cchan->state = S3C24XX_DMA_CHAN_IDLE;

}



static void s3c24xx_dma_unmap_buffers(struct s3c24xx_txd *txd)

{

	struct device *dev = txd->vd.tx.chan->device->dev;

	struct s3c24xx_sg *dsg;



	if (!(txd->vd.tx.flags & DMA_COMPL_SKIP_SRC_UNMAP)) {

		if (txd->vd.tx.flags & DMA_COMPL_SRC_UNMAP_SINGLE)

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_single(dev, dsg->src_addr, dsg->len,

						DMA_TO_DEVICE);

		else {

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_page(dev, dsg->src_addr, dsg->len,

						DMA_TO_DEVICE);

		}

	}



	if (!(txd->vd.tx.flags & DMA_COMPL_SKIP_DEST_UNMAP)) {

		if (txd->vd.tx.flags & DMA_COMPL_DEST_UNMAP_SINGLE)

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_single(dev, dsg->dst_addr, dsg->len,

						DMA_FROM_DEVICE);

		else

			list_for_each_entry(dsg, &txd->dsg_list, node)

				dma_unmap_page(dev, dsg->dst_addr, dsg->len,

						DMA_FROM_DEVICE);

	}

}



static void s3c24xx_dma_desc_free(struct virt_dma_desc *vd)

{

	struct s3c24xx_txd *txd = to_s3c24xx_txd(&vd->tx);

	struct s3c24xx_dma_chan *s3cchan = to_s3c24xx_dma_chan(vd->tx.chan);



	if (!s3cchan->slave)

		s3c24xx_dma_unmap_buffers(txd);

		dma_descriptor_unmap(&vd->tx);



	s3c24xx_dma_free_txd(txd);

}