From: Axel Lin Subject: [PATCH] ASoC: wm_hubs: Remove unneeded count variable in wait_for_dc_servo Date: Fri, 07 Oct 2011 15:54:25 +0800 Message-ID: <1317974065.16830.1.camel@phoenix> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-yw0-f51.google.com (mail-yw0-f51.google.com [209.85.213.51]) by alsa0.perex.cz (Postfix) with ESMTP id A2FDD24653 for ; Fri, 7 Oct 2011 09:54:36 +0200 (CEST) Received: by ywn1 with SMTP id 1so3942366ywn.38 for ; Fri, 07 Oct 2011 00:54:35 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: alsa-devel-bounces@alsa-project.org Errors-To: alsa-devel-bounces@alsa-project.org To: linux-kernel@vger.kernel.org Cc: alsa-devel@alsa-project.org, Mark Brown , Liam Girdwood List-Id: alsa-devel@alsa-project.org The count variable is not required, decrement timeout in the while loop can achieve the same effect. Signed-off-by: Axel Lin --- sound/soc/codecs/wm_hubs.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 84f33d4..6e2e122 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -66,7 +66,6 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) { struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); unsigned int reg; - int count = 0; int timeout; unsigned int val; @@ -83,7 +82,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) timeout = 400; do { - count++; + timeout--; if (hubs->dcs_done_irq) wait_for_completion_timeout(&hubs->dcs_done, @@ -93,9 +92,9 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) reg = snd_soc_read(codec, WM8993_DC_SERVO_0); dev_dbg(codec->dev, "DC servo: %x\n", reg); - } while (reg & op && count < timeout); + } while ((reg & op) && timeout); - if (reg & op) + if (timeout == 0) dev_err(codec->dev, "Timed out waiting for DC Servo %x\n", op); } -- 1.7.4.1