diff options
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/fsldma.c | 1 | ||||
-rw-r--r-- | drivers/dma/imx-dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/imx-sdma.c | 1 | ||||
-rw-r--r-- | drivers/dma/ioat/dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/iop-adma.c | 1 | ||||
-rw-r--r-- | drivers/dma/mv_xor.c | 1 | ||||
-rw-r--r-- | drivers/dma/mxs-dma.c | 1 | ||||
-rw-r--r-- | drivers/dma/ppc4xx/adma.c | 1 | ||||
-rw-r--r-- | drivers/dma/shdma.c | 1 |
9 files changed, 9 insertions, 0 deletions
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index 2f6c806126e2..7d7384b34621 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c | |||
@@ -1292,6 +1292,7 @@ static int __devinit fsl_dma_chan_probe(struct fsldma_device *fdev, | |||
1292 | chan->idle = true; | 1292 | chan->idle = true; |
1293 | 1293 | ||
1294 | chan->common.device = &fdev->common; | 1294 | chan->common.device = &fdev->common; |
1295 | dma_cookie_init(&chan->common); | ||
1295 | 1296 | ||
1296 | /* find the IRQ line, if it exists in the device tree */ | 1297 | /* find the IRQ line, if it exists in the device tree */ |
1297 | chan->irq = irq_of_parse_and_map(node, 0); | 1298 | chan->irq = irq_of_parse_and_map(node, 0); |
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c index 6731f1918c55..f0485c0a685a 100644 --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c | |||
@@ -347,6 +347,7 @@ static int __init imxdma_probe(struct platform_device *pdev) | |||
347 | spin_lock_init(&imxdmac->lock); | 347 | spin_lock_init(&imxdmac->lock); |
348 | 348 | ||
349 | imxdmac->chan.device = &imxdma->dma_device; | 349 | imxdmac->chan.device = &imxdma->dma_device; |
350 | dma_cookie_init(&imxdmac->chan); | ||
350 | imxdmac->channel = i; | 351 | imxdmac->channel = i; |
351 | 352 | ||
352 | /* Add the channel to the DMAC list */ | 353 | /* Add the channel to the DMAC list */ |
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 981071ebd5c8..ccfc7c425c52 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c | |||
@@ -1355,6 +1355,7 @@ static int __init sdma_probe(struct platform_device *pdev) | |||
1355 | spin_lock_init(&sdmac->lock); | 1355 | spin_lock_init(&sdmac->lock); |
1356 | 1356 | ||
1357 | sdmac->chan.device = &sdma->dma_device; | 1357 | sdmac->chan.device = &sdma->dma_device; |
1358 | dma_cookie_init(&sdmac->chan); | ||
1358 | sdmac->channel = i; | 1359 | sdmac->channel = i; |
1359 | 1360 | ||
1360 | /* | 1361 | /* |
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 97e100ce43eb..31493d80e0e9 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c | |||
@@ -109,6 +109,7 @@ void ioat_init_channel(struct ioatdma_device *device, struct ioat_chan_common *c | |||
109 | chan->reg_base = device->reg_base + (0x80 * (idx + 1)); | 109 | chan->reg_base = device->reg_base + (0x80 * (idx + 1)); |
110 | spin_lock_init(&chan->cleanup_lock); | 110 | spin_lock_init(&chan->cleanup_lock); |
111 | chan->common.device = dma; | 111 | chan->common.device = dma; |
112 | dma_cookie_init(&chan->common); | ||
112 | list_add_tail(&chan->common.device_node, &dma->channels); | 113 | list_add_tail(&chan->common.device_node, &dma->channels); |
113 | device->idx[idx] = chan; | 114 | device->idx[idx] = chan; |
114 | init_timer(&chan->timer); | 115 | init_timer(&chan->timer); |
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index 4370b1015f73..1f3a703ed0e0 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -1545,6 +1545,7 @@ static int __devinit iop_adma_probe(struct platform_device *pdev) | |||
1545 | INIT_LIST_HEAD(&iop_chan->chain); | 1545 | INIT_LIST_HEAD(&iop_chan->chain); |
1546 | INIT_LIST_HEAD(&iop_chan->all_slots); | 1546 | INIT_LIST_HEAD(&iop_chan->all_slots); |
1547 | iop_chan->common.device = dma_dev; | 1547 | iop_chan->common.device = dma_dev; |
1548 | dma_cookie_init(&iop_chan->common); | ||
1548 | list_add_tail(&iop_chan->common.device_node, &dma_dev->channels); | 1549 | list_add_tail(&iop_chan->common.device_node, &dma_dev->channels); |
1549 | 1550 | ||
1550 | if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask)) { | 1551 | if (dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask)) { |
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 486353e60a0a..fa5d55fea46c 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
@@ -1193,6 +1193,7 @@ static int __devinit mv_xor_probe(struct platform_device *pdev) | |||
1193 | INIT_LIST_HEAD(&mv_chan->completed_slots); | 1193 | INIT_LIST_HEAD(&mv_chan->completed_slots); |
1194 | INIT_LIST_HEAD(&mv_chan->all_slots); | 1194 | INIT_LIST_HEAD(&mv_chan->all_slots); |
1195 | mv_chan->common.device = dma_dev; | 1195 | mv_chan->common.device = dma_dev; |
1196 | dma_cookie_init(&mv_chan->common); | ||
1196 | 1197 | ||
1197 | list_add_tail(&mv_chan->common.device_node, &dma_dev->channels); | 1198 | list_add_tail(&mv_chan->common.device_node, &dma_dev->channels); |
1198 | 1199 | ||
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index 5f3492e5d28f..a2267f9ab568 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c | |||
@@ -618,6 +618,7 @@ static int __init mxs_dma_probe(struct platform_device *pdev) | |||
618 | 618 | ||
619 | mxs_chan->mxs_dma = mxs_dma; | 619 | mxs_chan->mxs_dma = mxs_dma; |
620 | mxs_chan->chan.device = &mxs_dma->dma_device; | 620 | mxs_chan->chan.device = &mxs_dma->dma_device; |
621 | dma_cookie_init(&mxs_chan->chan); | ||
621 | 622 | ||
622 | tasklet_init(&mxs_chan->tasklet, mxs_dma_tasklet, | 623 | tasklet_init(&mxs_chan->tasklet, mxs_dma_tasklet, |
623 | (unsigned long) mxs_chan); | 624 | (unsigned long) mxs_chan); |
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index 975206257f6e..ced98826684a 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c | |||
@@ -4497,6 +4497,7 @@ static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev) | |||
4497 | INIT_LIST_HEAD(&chan->all_slots); | 4497 | INIT_LIST_HEAD(&chan->all_slots); |
4498 | chan->device = adev; | 4498 | chan->device = adev; |
4499 | chan->common.device = &adev->common; | 4499 | chan->common.device = &adev->common; |
4500 | dma_cookie_init(&chan->common); | ||
4500 | list_add_tail(&chan->common.device_node, &adev->common.channels); | 4501 | list_add_tail(&chan->common.device_node, &adev->common.channels); |
4501 | tasklet_init(&chan->irq_tasklet, ppc440spe_adma_tasklet, | 4502 | tasklet_init(&chan->irq_tasklet, ppc440spe_adma_tasklet, |
4502 | (unsigned long)chan); | 4503 | (unsigned long)chan); |
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 50510ef7db72..5c4088603dd4 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
@@ -1089,6 +1089,7 @@ static int __devinit sh_dmae_chan_probe(struct sh_dmae_device *shdev, int id, | |||
1089 | 1089 | ||
1090 | /* reference struct dma_device */ | 1090 | /* reference struct dma_device */ |
1091 | new_sh_chan->common.device = &shdev->common; | 1091 | new_sh_chan->common.device = &shdev->common; |
1092 | dma_cookie_init(&new_sh_chan->common); | ||
1092 | 1093 | ||
1093 | new_sh_chan->dev = shdev->common.dev; | 1094 | new_sh_chan->dev = shdev->common.dev; |
1094 | new_sh_chan->id = id; | 1095 | new_sh_chan->id = id; |