aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/sa11x0-dma.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/dma/sa11x0-dma.c')
-rw-r--r--drivers/dma/sa11x0-dma.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c
index 5adf5407a8cb..43db255050d2 100644
--- a/drivers/dma/sa11x0-dma.c
+++ b/drivers/dma/sa11x0-dma.c
@@ -389,11 +389,6 @@ static void sa11x0_dma_tasklet(unsigned long arg)
389} 389}
390 390
391 391
392static int sa11x0_dma_alloc_chan_resources(struct dma_chan *chan)
393{
394 return 0;
395}
396
397static void sa11x0_dma_free_chan_resources(struct dma_chan *chan) 392static void sa11x0_dma_free_chan_resources(struct dma_chan *chan)
398{ 393{
399 struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan); 394 struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan);
@@ -835,7 +830,6 @@ static int sa11x0_dma_init_dmadev(struct dma_device *dmadev,
835 830
836 INIT_LIST_HEAD(&dmadev->channels); 831 INIT_LIST_HEAD(&dmadev->channels);
837 dmadev->dev = dev; 832 dmadev->dev = dev;
838 dmadev->device_alloc_chan_resources = sa11x0_dma_alloc_chan_resources;
839 dmadev->device_free_chan_resources = sa11x0_dma_free_chan_resources; 833 dmadev->device_free_chan_resources = sa11x0_dma_free_chan_resources;
840 dmadev->device_config = sa11x0_dma_device_config; 834 dmadev->device_config = sa11x0_dma_device_config;
841 dmadev->device_pause = sa11x0_dma_device_pause; 835 dmadev->device_pause = sa11x0_dma_device_pause;
@@ -948,6 +942,12 @@ static int sa11x0_dma_probe(struct platform_device *pdev)
948 dma_cap_set(DMA_CYCLIC, d->slave.cap_mask); 942 dma_cap_set(DMA_CYCLIC, d->slave.cap_mask);
949 d->slave.device_prep_slave_sg = sa11x0_dma_prep_slave_sg; 943 d->slave.device_prep_slave_sg = sa11x0_dma_prep_slave_sg;
950 d->slave.device_prep_dma_cyclic = sa11x0_dma_prep_dma_cyclic; 944 d->slave.device_prep_dma_cyclic = sa11x0_dma_prep_dma_cyclic;
945 d->slave.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
946 d->slave.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
947 d->slave.src_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) |
948 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES);
949 d->slave.dst_addr_widths = BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) |
950 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES);
951 ret = sa11x0_dma_init_dmadev(&d->slave, &pdev->dev); 951 ret = sa11x0_dma_init_dmadev(&d->slave, &pdev->dev);
952 if (ret) { 952 if (ret) {
953 dev_warn(d->slave.dev, "failed to register slave async device: %d\n", 953 dev_warn(d->slave.dev, "failed to register slave async device: %d\n",