From patchwork Wed Nov 28 09:15:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 13264 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 814062425B for ; Wed, 28 Nov 2012 09:21:59 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 28A6AA19DFD for ; Wed, 28 Nov 2012 09:21:59 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so6799499iag.11 for ; Wed, 28 Nov 2012 01:21:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=8fq3fvNumEyJ3L2KaaKSr72WNiCYim2NkRepUGNuFOQ=; b=DJdl4eC2Vy42LHILoJJ9mh425SQpfRaiTgJVM7EHa19xmYZqUlsqi+dGGBWUiL9hTD ve+tPZUEwQvYk8/OMHNYkYO3QVCefHYG44Fr+w87/MXs+KmT1Gq4IoY6muSrq405WJJD 7MW+FwbjKSSFdjqCxyEhwiaIuXR7qyWNqeeP8Nk/5UX6lw5xidV1HGv9jzB8iSxJViyb J7VddLy+R2kwHjSLGgXBpLrr2sUxof9Lby69nMMpP5t43Pvay0yv1nNfdlEIs64khG3E Ua/7TknfekxsVZVwFKT3Q2e2zCiHJK0Rxi1sJuKAv5npLqJpmUKHHyY7rx50gExcoICY Fg3g== Received: by 10.50.213.34 with SMTP id np2mr18263321igc.57.1354094518435; Wed, 28 Nov 2012 01:21:58 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.67.148 with SMTP id n20csp614813igt; Wed, 28 Nov 2012 01:21:57 -0800 (PST) Received: by 10.66.81.198 with SMTP id c6mr40202086pay.50.1354094517719; Wed, 28 Nov 2012 01:21:57 -0800 (PST) Received: from mail-pb0-f45.google.com (mail-pb0-f45.google.com [209.85.160.45]) by mx.google.com with ESMTPS id y1si27796180pav.45.2012.11.28.01.21.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 01:21:57 -0800 (PST) Received-SPF: neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.45; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.45 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by mail-pb0-f45.google.com with SMTP id mc8so10217415pbc.18 for ; Wed, 28 Nov 2012 01:21:57 -0800 (PST) Received: by 10.68.245.169 with SMTP id xp9mr57057761pbc.142.1354094517380; Wed, 28 Nov 2012 01:21:57 -0800 (PST) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id oi3sm12174264pbb.1.2012.11.28.01.21.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 28 Nov 2012 01:21:56 -0800 (PST) From: Sachin Kamat To: alsa-devel@alsa-project.org Cc: patches@opensource.wolfsonmicro.com, broonie@opensource.wolfsonmicro.com, lrg@ti.com, tiwai@suse.de, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/1] ASoC: wm2200: Remove empty labels Date: Wed, 28 Nov 2012 14:45:25 +0530 Message-Id: <1354094125-4506-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQlJiICkDhReR6kwY1alaaWDzpltFC49669MpXxbkQKmNghera0W+g13Q8aHPD2TELygoiJ9 Removed unnecessary labels probably left out of some previous cleanup. Signed-off-by: Sachin Kamat --- sound/soc/codecs/wm2200.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/wm2200.c b/sound/soc/codecs/wm2200.c index 1730df8..ff45b02 100644 --- a/sound/soc/codecs/wm2200.c +++ b/sound/soc/codecs/wm2200.c @@ -2205,7 +2205,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, ret = PTR_ERR(wm2200->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - goto err; + return ret; } for (i = 0; i < 2; i++) { @@ -2238,7 +2238,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, if (ret != 0) { dev_err(&i2c->dev, "Failed to request core supplies: %d\n", ret); - goto err_regmap; + return ret; } ret = regulator_bulk_enable(ARRAY_SIZE(wm2200->core_supplies), @@ -2246,7 +2246,7 @@ static __devinit int wm2200_i2c_probe(struct i2c_client *i2c, if (ret != 0) { dev_err(&i2c->dev, "Failed to enable core supplies: %d\n", ret); - goto err_core; + return ret; } if (wm2200->pdata.ldo_ena) { @@ -2382,9 +2382,6 @@ err_ldo: err_enable: regulator_bulk_disable(ARRAY_SIZE(wm2200->core_supplies), wm2200->core_supplies); -err_core: -err_regmap: -err: return ret; }