41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
|
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
|
||
|
|
index 110de8a60058..0a01256ef9e4 100644
|
||
|
|
--- a/drivers/dma/pl330.c
|
||
|
|
+++ b/drivers/dma/pl330.c
|
||
|
|
@@ -1050,7 +1050,7 @@ static bool _trigger(struct pl330_thread *thrd)
|
||
|
|
return true;
|
||
|
|
}
|
||
|
|
|
||
|
|
-static bool _start(struct pl330_thread *thrd)
|
||
|
|
+static bool _dma_start(struct pl330_thread *thrd)
|
||
|
|
{
|
||
|
|
switch (_state(thrd)) {
|
||
|
|
case PL330_STATE_FAULT_COMPLETING:
|
||
|
|
@@ -1702,7 +1702,7 @@ static int pl330_update(struct pl330_dmac *pl330)
|
||
|
|
thrd->req_running = -1;
|
||
|
|
|
||
|
|
/* Get going again ASAP */
|
||
|
|
- _start(thrd);
|
||
|
|
+ _dma_start(thrd);
|
||
|
|
|
||
|
|
/* For now, just make a list of callbacks to be done */
|
||
|
|
list_add_tail(&descdone->rqd, &pl330->req_done);
|
||
|
|
@@ -2089,7 +2089,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
|
||
|
|
} else {
|
||
|
|
/* Make sure the PL330 Channel thread is active */
|
||
|
|
spin_lock(&pch->thread->dmac->lock);
|
||
|
|
- _start(pch->thread);
|
||
|
|
+ _dma_start(pch->thread);
|
||
|
|
spin_unlock(&pch->thread->dmac->lock);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -2107,7 +2107,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
|
||
|
|
if (power_down) {
|
||
|
|
pch->active = true;
|
||
|
|
spin_lock(&pch->thread->dmac->lock);
|
||
|
|
- _start(pch->thread);
|
||
|
|
+ _dma_start(pch->thread);
|
||
|
|
spin_unlock(&pch->thread->dmac->lock);
|
||
|
|
power_down = false;
|
||
|
|
}
|