]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
dmaengine: bcm2835: Return void from abort of transactions
authorLukas Wunner <lukas@wunner.de>
Wed, 23 Jan 2019 08:26:00 +0000 (09:26 +0100)
committerVinod Koul <vkoul@kernel.org>
Mon, 4 Feb 2019 07:11:18 +0000 (12:41 +0530)
bcm2835_dma_abort() returns an int but bcm2835_dma_terminate_all() (its
sole caller) does not evaluate the return value. Change the return type
to void.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: Frank Pavlic <f.pavlic@kunbus.de>
Cc: Martin Sperl <kernel@martin.sperl.org>
Cc: Florian Meier <florian.meier@koalo.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Acked-by: Florian Kauer <florian.kauer@koalo.de>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/dma/bcm2835-dma.c

index ae10f5614f953e5fee68a60b85bddff0947b238e..a56fe373e8f917ddb3cb67123a757dda5878d1f3 100644 (file)
@@ -406,7 +406,7 @@ static void bcm2835_dma_fill_cb_chain_with_sg(
        }
 }
 
-static int bcm2835_dma_abort(struct bcm2835_chan *c)
+static void bcm2835_dma_abort(struct bcm2835_chan *c)
 {
        void __iomem *chan_base = c->chan_base;
        long int timeout = 10000;
@@ -416,7 +416,7 @@ static int bcm2835_dma_abort(struct bcm2835_chan *c)
         * (The ACTIVE flag in the CS register is not a reliable indicator.)
         */
        if (!readl(chan_base + BCM2835_DMA_ADDR))
-               return 0;
+               return;
 
        /* Write 0 to the active bit - Pause the DMA */
        writel(0, chan_base + BCM2835_DMA_CS);
@@ -432,7 +432,6 @@ static int bcm2835_dma_abort(struct bcm2835_chan *c)
                        "failed to complete outstanding writes\n");
 
        writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS);
-       return 0;
 }
 
 static void bcm2835_dma_start_desc(struct bcm2835_chan *c)