Skip to content

Commit a1a5f2c

Browse files
rddunlapvinodkoul
authored andcommitted
dmaengine: pl330: rename _start to prevent build error
"_start" is used in several arches and proably should be reserved for ARCH usage. Using it in a driver for a private symbol can cause a build error when it conflicts with ARCH usage of the same symbol. Therefore rename pl330's "_start" to "pl330_start_thread" so that there is no conflict and no build error. drivers/dma/pl330.c:1053:13: error: '_start' redeclared as different kind of symbol 1053 | static bool _start(struct pl330_thread *thrd) | ^~~~~~ In file included from ../include/linux/interrupt.h:21, from ../drivers/dma/pl330.c:18: arch/riscv/include/asm/sections.h:11:13: note: previous declaration of '_start' with type 'char[]' 11 | extern char _start[]; | ^~~~~~ Fixes: b7d861d ("DMA: PL330: Merge PL330 driver into drivers/dma/") Fixes: ae43b32 ("ARM: 8202/1: dmaengine: pl330: Add runtime Power Management support v12") Signed-off-by: Randy Dunlap <[email protected]> Cc: Jaswinder Singh <[email protected]> Cc: Boojin Kim <[email protected]> Cc: Krzysztof Kozlowski <[email protected]> Cc: Russell King <[email protected]> Cc: Vinod Koul <[email protected]> Cc: [email protected] Cc: [email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Vinod Koul <[email protected]>
1 parent 4d43acb commit a1a5f2c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/dma/pl330.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,7 +1050,7 @@ static bool _trigger(struct pl330_thread *thrd)
10501050
return true;
10511051
}
10521052

1053-
static bool _start(struct pl330_thread *thrd)
1053+
static bool pl330_start_thread(struct pl330_thread *thrd)
10541054
{
10551055
switch (_state(thrd)) {
10561056
case PL330_STATE_FAULT_COMPLETING:
@@ -1702,7 +1702,7 @@ static int pl330_update(struct pl330_dmac *pl330)
17021702
thrd->req_running = -1;
17031703

17041704
/* Get going again ASAP */
1705-
_start(thrd);
1705+
pl330_start_thread(thrd);
17061706

17071707
/* For now, just make a list of callbacks to be done */
17081708
list_add_tail(&descdone->rqd, &pl330->req_done);
@@ -2089,7 +2089,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
20892089
} else {
20902090
/* Make sure the PL330 Channel thread is active */
20912091
spin_lock(&pch->thread->dmac->lock);
2092-
_start(pch->thread);
2092+
pl330_start_thread(pch->thread);
20932093
spin_unlock(&pch->thread->dmac->lock);
20942094
}
20952095

@@ -2107,7 +2107,7 @@ static void pl330_tasklet(struct tasklet_struct *t)
21072107
if (power_down) {
21082108
pch->active = true;
21092109
spin_lock(&pch->thread->dmac->lock);
2110-
_start(pch->thread);
2110+
pl330_start_thread(pch->thread);
21112111
spin_unlock(&pch->thread->dmac->lock);
21122112
power_down = false;
21132113
}

0 commit comments

Comments
 (0)