Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e05ada0 authored by Lukas Wunner's avatar Lukas Wunner Committed by Vinod Koul
Browse files

dmaengine: bcm2835: Return void from abort of transactions 



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: default avatarLukas 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: default avatarStefan Wahren <stefan.wahren@i2se.com>
Acked-by: default avatarFlorian Kauer <florian.kauer@koalo.de>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 9e528c79

drivers/dma/bcm2835-dma.c

+2 −3
Original line number Diff line number Diff line
@@ -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)