diff options
| author | Lukas Wunner <lukas@wunner.de> | 2019-01-23 03:26:00 -0500 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2019-02-04 02:11:18 -0500 |
| commit | 3e05ada043828c5880c88789c824e3d40d6830cb (patch) | |
| tree | 7d89392e517a36cc629a88113bce97fe9ca592eb | |
| parent | 9e528c799d17a4ac37d788c81440b50377dd592d (diff) | |
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: 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>
| -rw-r--r-- | drivers/dma/bcm2835-dma.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index ae10f5614f95..a56fe373e8f9 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c | |||
| @@ -406,7 +406,7 @@ static void bcm2835_dma_fill_cb_chain_with_sg( | |||
| 406 | } | 406 | } |
| 407 | } | 407 | } |
| 408 | 408 | ||
| 409 | static int bcm2835_dma_abort(struct bcm2835_chan *c) | 409 | static void bcm2835_dma_abort(struct bcm2835_chan *c) |
| 410 | { | 410 | { |
| 411 | void __iomem *chan_base = c->chan_base; | 411 | void __iomem *chan_base = c->chan_base; |
| 412 | long int timeout = 10000; | 412 | long int timeout = 10000; |
| @@ -416,7 +416,7 @@ static int bcm2835_dma_abort(struct bcm2835_chan *c) | |||
| 416 | * (The ACTIVE flag in the CS register is not a reliable indicator.) | 416 | * (The ACTIVE flag in the CS register is not a reliable indicator.) |
| 417 | */ | 417 | */ |
| 418 | if (!readl(chan_base + BCM2835_DMA_ADDR)) | 418 | if (!readl(chan_base + BCM2835_DMA_ADDR)) |
| 419 | return 0; | 419 | return; |
| 420 | 420 | ||
| 421 | /* Write 0 to the active bit - Pause the DMA */ | 421 | /* Write 0 to the active bit - Pause the DMA */ |
| 422 | writel(0, chan_base + BCM2835_DMA_CS); | 422 | writel(0, chan_base + BCM2835_DMA_CS); |
| @@ -432,7 +432,6 @@ static int bcm2835_dma_abort(struct bcm2835_chan *c) | |||
| 432 | "failed to complete outstanding writes\n"); | 432 | "failed to complete outstanding writes\n"); |
| 433 | 433 | ||
| 434 | writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS); | 434 | writel(BCM2835_DMA_RESET, chan_base + BCM2835_DMA_CS); |
| 435 | return 0; | ||
| 436 | } | 435 | } |
| 437 | 436 | ||
| 438 | static void bcm2835_dma_start_desc(struct bcm2835_chan *c) | 437 | static void bcm2835_dma_start_desc(struct bcm2835_chan *c) |
