Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[firefly-linux-kernel-4.4.55.git] / drivers / dma / bcm2835-dma.c

diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index 68007974961a5ee63087c07cf7833404b09b7d49..918b7b3f766f03b19e15792a760eaf544342a182 100644 (file)
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -525,8 +525,6 @@ static int bcm2835_dma_chan_init(struct bcm2835_dmadev *d, int chan_id, int irq)
        vchan_init(&c->vc, &d->ddev);
        INIT_LIST_HEAD(&c->node);
 
-       d->ddev.chancnt++;
-
        c->chan_base = BCM2835_DMA_CHANIO(d->base, chan_id);
        c->ch = chan_id;
        c->irq_number = irq;
@@ -694,7 +692,6 @@ static struct platform_driver bcm2835_dma_driver = {
        .remove = bcm2835_dma_remove,
        .driver = {
                .name = "bcm2835-dma",
-               .owner = THIS_MODULE,
                .of_match_table = of_match_ptr(bcm2835_dma_of_match),
        },
 };