diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2015-03-18 22:46:19 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-03-18 22:46:19 +0530 |
| commit | 381a3c4a33bf33943ed3791bd8797d8d8490b4fd (patch) | |
| tree | 122afe0267936a19c23d340b4291b66c6b92cee7 /drivers/dma/amba-pl08x.c | |
| parent | 75967b788c2898601620ce91ed14b4a9a371b6fe (diff) | |
| parent | 2fcb9e3c86fc312beb031832fca783498fd4bdb5 (diff) | |
| download | op-kernel-dev-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.zip op-kernel-dev-381a3c4a33bf33943ed3791bd8797d8d8490b4fd.tar.gz | |
Merge branch 'topic/alloc_removal' into for-linus
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
| -rw-r--r-- | drivers/dma/amba-pl08x.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 171e768..e7c50d4 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -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; |
