From: eero.nurkkala@offcode.fi Subject: [PATCH 1/7] msm: qdspv2: apr: remove unused load_q6() Date: Mon, 21 Feb 2011 09:18:13 +0200 Message-ID: <1298272699-11692-2-git-send-email-eero.nurkkala@offcode.fi> References: <1298272699-11692-1-git-send-email-eero.nurkkala@offcode.fi> Return-path: Received: from smtp.nokia.com ([147.243.128.26]:39921 "EHLO mgw-da02.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750832Ab1BUHOB (ORCPT ); Mon, 21 Feb 2011 02:14:01 -0500 In-Reply-To: <1298272699-11692-1-git-send-email-eero.nurkkala@offcode.fi> Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: linux-arm-msm@vger.kernel.org Cc: Eero Nurkkala From: Eero Nurkkala 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 --- 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