From aaa6b07afc22da57a9dba9b3f46772a38bc3c065 Mon Sep 17 00:00:00 2001 From: Boojin Kim Date: Mon, 26 Dec 2011 18:51:41 +0900 Subject: [PATCH] --- yaml --- r: 297513 b: refs/heads/master c: b06db6e56c0850617291b8921582d04255022425 h: refs/heads/master i: 297511: 8640cd00feaddb431d1bc91d67b47038020fd285 v: v3 --- [refs] | 2 +- trunk/drivers/dma/pl330.c | 46 --------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) diff --git a/[refs] b/[refs] index cf3bc1fcba80..3e304b1019d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7d861d9394534db94f0fb8f4b9d984f996d0528 +refs/heads/master: b06db6e56c0850617291b8921582d04255022425 diff --git a/trunk/drivers/dma/pl330.c b/trunk/drivers/dma/pl330.c index 2e351f40fc49..dd74c2478c6d 100644 --- a/trunk/drivers/dma/pl330.c +++ b/trunk/drivers/dma/pl330.c @@ -1824,52 +1824,6 @@ static int pl330_chan_ctrl(void *ch_id, enum pl330_chan_op op) return ret; } -static int pl330_chan_status(void *ch_id, struct pl330_chanstatus *pstatus) -{ - struct pl330_thread *thrd = ch_id; - struct pl330_dmac *pl330; - struct pl330_info *pi; - void __iomem *regs; - int active; - u32 val; - - if (!pstatus || !thrd || thrd->free) - return -EINVAL; - - pl330 = thrd->dmac; - pi = pl330->pinfo; - regs = pi->base; - - /* The client should remove the DMAC and add again */ - if (pl330->state == DYING) - pstatus->dmac_halted = true; - else - pstatus->dmac_halted = false; - - val = readl(regs + FSC); - if (val & (1 << thrd->id)) - pstatus->faulting = true; - else - pstatus->faulting = false; - - active = thrd->req_running; - - if (active == -1) { - /* Indicate that the thread is not running */ - pstatus->top_req = NULL; - pstatus->wait_req = NULL; - } else { - pstatus->top_req = thrd->req[active].r; - pstatus->wait_req = !IS_FREE(&thrd->req[1 - active]) - ? thrd->req[1 - active].r : NULL; - } - - pstatus->src_addr = readl(regs + SA(thrd->id)); - pstatus->dst_addr = readl(regs + DA(thrd->id)); - - return 0; -} - /* Reserve an event */ static inline int _alloc_event(struct pl330_thread *thrd) {