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

Commit 381a3c4a authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/alloc_removal' into for-linus

parents 75967b78 2fcb9e3c

drivers/dma/amba-pl08x.c

+0 −7
Original line number Diff line number Diff line
@@ -1185,11 +1185,6 @@ static void pl08x_free_txd_list(struct pl08x_driver_data *pl08x, 
/*

 * The DMA ENGINE API

 */

static int pl08x_alloc_chan_resources(struct dma_chan *chan)

{

	return 0;

}



static void pl08x_free_chan_resources(struct dma_chan *chan)

{

	/* Ensure all queued descriptors are freed */
@@ -2056,7 +2051,6 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id) 
	/* Initialize memcpy engine */

	dma_cap_set(DMA_MEMCPY, pl08x->memcpy.cap_mask);

	pl08x->memcpy.dev = &adev->dev;

	pl08x->memcpy.device_alloc_chan_resources = pl08x_alloc_chan_resources;

	pl08x->memcpy.device_free_chan_resources = pl08x_free_chan_resources;

	pl08x->memcpy.device_prep_dma_memcpy = pl08x_prep_dma_memcpy;

	pl08x->memcpy.device_prep_dma_interrupt = pl08x_prep_dma_interrupt;
@@ -2071,7 +2065,6 @@ static int pl08x_probe(struct amba_device *adev, const struct amba_id *id) 
	dma_cap_set(DMA_SLAVE, pl08x->slave.cap_mask);

	dma_cap_set(DMA_CYCLIC, pl08x->slave.cap_mask);

	pl08x->slave.dev = &adev->dev;

	pl08x->slave.device_alloc_chan_resources = pl08x_alloc_chan_resources;

	pl08x->slave.device_free_chan_resources = pl08x_free_chan_resources;

	pl08x->slave.device_prep_dma_interrupt = pl08x_prep_dma_interrupt;

	pl08x->slave.device_tx_status = pl08x_dma_tx_status;

drivers/dma/dma-jz4740.c

+0 −6
Original line number Diff line number Diff line
@@ -492,11 +492,6 @@ static enum dma_status jz4740_dma_tx_status(struct dma_chan *c, 
	return status;

}



static int jz4740_dma_alloc_chan_resources(struct dma_chan *c)

{

	return 0;

}



static void jz4740_dma_free_chan_resources(struct dma_chan *c)

{

	vchan_free_chan_resources(to_virt_chan(c));
@@ -536,7 +531,6 @@ static int jz4740_dma_probe(struct platform_device *pdev) 


	dma_cap_set(DMA_SLAVE, dd->cap_mask);

	dma_cap_set(DMA_CYCLIC, dd->cap_mask);

	dd->device_alloc_chan_resources = jz4740_dma_alloc_chan_resources;

	dd->device_free_chan_resources = jz4740_dma_free_chan_resources;

	dd->device_tx_status = jz4740_dma_tx_status;

	dd->device_issue_pending = jz4740_dma_issue_pending;

drivers/dma/img-mdc-dma.c

+0 −6
Original line number Diff line number Diff line
@@ -689,11 +689,6 @@ static int mdc_slave_config(struct dma_chan *chan, 
	return 0;

}



static int mdc_alloc_chan_resources(struct dma_chan *chan)

{

	return 0;

}



static void mdc_free_chan_resources(struct dma_chan *chan)

{

	struct mdc_chan *mchan = to_mdc_chan(chan);
@@ -910,7 +905,6 @@ static int mdc_dma_probe(struct platform_device *pdev) 
	mdma->dma_dev.device_prep_slave_sg = mdc_prep_slave_sg;

	mdma->dma_dev.device_prep_dma_cyclic = mdc_prep_dma_cyclic;

	mdma->dma_dev.device_prep_dma_memcpy = mdc_prep_dma_memcpy;

	mdma->dma_dev.device_alloc_chan_resources = mdc_alloc_chan_resources;

	mdma->dma_dev.device_free_chan_resources = mdc_free_chan_resources;

	mdma->dma_dev.device_tx_status = mdc_tx_status;

	mdma->dma_dev.device_issue_pending = mdc_issue_pending;

drivers/dma/k3dma.c

+0 −6
Original line number Diff line number Diff line
@@ -313,11 +313,6 @@ static void k3_dma_tasklet(unsigned long arg) 
	}

}



static int k3_dma_alloc_chan_resources(struct dma_chan *chan)

{

	return 0;

}



static void k3_dma_free_chan_resources(struct dma_chan *chan)

{

	struct k3_dma_chan *c = to_k3_chan(chan);
@@ -728,7 +723,6 @@ static int k3_dma_probe(struct platform_device *op) 
	dma_cap_set(DMA_SLAVE, d->slave.cap_mask);

	dma_cap_set(DMA_MEMCPY, d->slave.cap_mask);

	d->slave.dev = &op->dev;

	d->slave.device_alloc_chan_resources = k3_dma_alloc_chan_resources;

	d->slave.device_free_chan_resources = k3_dma_free_chan_resources;

	d->slave.device_tx_status = k3_dma_tx_status;

	d->slave.device_prep_dma_memcpy = k3_dma_prep_memcpy;

drivers/dma/s3c24xx-dma.c

+0 −9
Original line number Diff line number Diff line
@@ -749,11 +749,6 @@ static int s3c24xx_dma_terminate_all(struct dma_chan *chan) 
	return ret;

}



static int s3c24xx_dma_alloc_chan_resources(struct dma_chan *chan)

{

	return 0;

}



static void s3c24xx_dma_free_chan_resources(struct dma_chan *chan)

{

	/* Ensure all queued descriptors are freed */
@@ -1290,8 +1285,6 @@ static int s3c24xx_dma_probe(struct platform_device *pdev) 
	dma_cap_set(DMA_MEMCPY, s3cdma->memcpy.cap_mask);

	dma_cap_set(DMA_PRIVATE, s3cdma->memcpy.cap_mask);

	s3cdma->memcpy.dev = &pdev->dev;

	s3cdma->memcpy.device_alloc_chan_resources =

					s3c24xx_dma_alloc_chan_resources;

	s3cdma->memcpy.device_free_chan_resources =

					s3c24xx_dma_free_chan_resources;

	s3cdma->memcpy.device_prep_dma_memcpy = s3c24xx_dma_prep_memcpy;
@@ -1305,8 +1298,6 @@ static int s3c24xx_dma_probe(struct platform_device *pdev) 
	dma_cap_set(DMA_CYCLIC, s3cdma->slave.cap_mask);

	dma_cap_set(DMA_PRIVATE, s3cdma->slave.cap_mask);

	s3cdma->slave.dev = &pdev->dev;

	s3cdma->slave.device_alloc_chan_resources =

					s3c24xx_dma_alloc_chan_resources;

	s3cdma->slave.device_free_chan_resources =

					s3c24xx_dma_free_chan_resources;

	s3cdma->slave.device_tx_status = s3c24xx_dma_tx_status;