From: Eero Nurkkala <eero.nurkkala@xxxxxxxxxx>
Remove this unused function load_q6().
Moreover, it contains unusual use of svc_idx: (not initialized):
static int svc_idx;
...
mutex_lock(&client[dest_id][client_id].svc[svc_idx].m_lock);
mutex_unlock(&client[dest_id][client_id].svc[svc_idx].m_lock);
Signed-off-by: Eero Nurkkala <eero.nurkkala@xxxxxxxxxx>
---
arch/arm/mach-msm/qdsp6v2/apr.c | 46 ---------------------------------------
1 files changed, 0 insertions(+), 46 deletions(-)
diff --git a/arch/arm/mach-msm/qdsp6v2/apr.c b/arch/arm/mach-msm/qdsp6v2/apr.c
index 79ace26..fabf4e5 100644
--- a/arch/arm/mach-msm/qdsp6v2/apr.c
+++ b/arch/arm/mach-msm/qdsp6v2/apr.c
@@ -464,52 +464,6 @@ void change_q6_state(int state)
mutex_unlock(&q6.lock);
}
-void load_q6(void)
-{
- static int client_id = APR_CLIENT_AUDIO;
- static int dest_id = APR_DEST_QDSP6;
- static int svc_idx;
- int delay_cnt = 0;
-
- mutex_lock(&q6.lock);
- if (q6.state == APR_Q6_NOIMG) {
- q6.pil = pil_get("q6");
- if (!q6.pil) {
- pr_info("APR: Unable to load q6 image\n");
- goto q6_unlock;
- }
- q6.state = APR_Q6_LOADING;
- }
- pr_info("Q6 loading done: Waiting for apr_init\n");
- mutex_lock(&client[dest_id][client_id].svc[svc_idx].m_lock);
- do {
- client[dest_id][client_id].handle = apr_tal_open(client_id,
- dest_id, APR_DL_SMD, apr_cb_func, NULL);
- if (!client[dest_id][client_id].handle) {
- if (q6.state == APR_Q6_LOADED) {
- pr_info("APR: Unable to open handle\n");
- goto unlock;
- }
- udelay(5);
- if (delay_cnt++ < 400000)
- continue;
- } else if (q6.state == APR_Q6_LOADING) {
- q6.state = APR_Q6_LOADED;
- pr_info("apr_init done\n");
- msleep(50);
- pr_info("Audio init done\n");
- }
- break;
- } while (1);
-
- if (delay_cnt >= 400000)
- pr_info("Q6 Init not yet done in 2 secs\n");
-unlock:
- mutex_unlock(&client[dest_id][client_id].svc[svc_idx].m_lock);
-q6_unlock:
- mutex_unlock(&q6.lock);
-}
-
int adsp_state(int state)
{
pr_info("dsp state = %d\n", state);
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
