From patchwork Tue Jun 10 03:35:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 4326531 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EEDF6BEEAA for ; Tue, 10 Jun 2014 03:36:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1B19F20176 for ; Tue, 10 Jun 2014 03:36:26 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id C68FF2013D for ; Tue, 10 Jun 2014 03:36:24 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 3DFC926566C; Tue, 10 Jun 2014 05:36:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 450532651AD; Tue, 10 Jun 2014 05:36:12 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id C973F26562E; Tue, 10 Jun 2014 05:36:10 +0200 (CEST) Received: from mail-pa0-f45.google.com (mail-pa0-f45.google.com [209.85.220.45]) by alsa0.perex.cz (Postfix) with ESMTP id 8802B2651AD for ; Tue, 10 Jun 2014 05:36:02 +0200 (CEST) Received: by mail-pa0-f45.google.com with SMTP id hz1so206653pad.18 for ; Mon, 09 Jun 2014 20:36:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:subject:from:to:cc:date:content-type :mime-version:content-transfer-encoding; bh=0KnqLgBvOxH8z7yrrwWB2drE10UWdDH6G3vszFklLuU=; b=DZmM/LmxcMeB0yKyktZCAVQY5W/M/ju9GQpmIezmpfxbmDw5WCZ8tv6U5esnJmeBNF hCUG/ur1+c2TrETgoavabuEyKDUuIhYbWOckdncOqgXufFsgomjkGvZfD6RlThQIqfK3 y+fEnx1iL9jnkNOtBmI6zihEJJDl4DGK5wKuBQ4qJC8fMmEDit2/B73inej6KODtRiKS 27wnSZRHGAoSI/D/yQlINav6KHa8nNJ6SwkQyng9ptRlB1zSM6sY25FS5CPr/CA0EnKj BcGX2KlrK8YFq0jMGukenjKLxS50csMUrC1MjNwuvfTUb2dM3AyMT6oqj59bNqONJ3Sg Mn4g== X-Gm-Message-State: ALoCoQkl6UV66fM4LzsrOD3t2LpmsS09xHgq+fG79mKbx4nZpQxh6LgVbJiHy7Q1wtnuoBA+uP7N X-Received: by 10.66.146.72 with SMTP id ta8mr2503908pab.150.1402371360347; Mon, 09 Jun 2014 20:36:00 -0700 (PDT) Received: from [192.168.1.112] (111-240-58-131.dynamic.hinet.net. [111.240.58.131]) by mx.google.com with ESMTPSA id ty3sm5960275pab.20.2014.06.09.20.35.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 09 Jun 2014 20:35:59 -0700 (PDT) Message-ID: <1402371356.16323.1.camel@phoenix> From: Axel Lin To: Mark Brown Date: Tue, 10 Jun 2014 11:35:56 +0800 X-Mailer: Evolution 3.8.4-0ubuntu1 Mime-Version: 1.0 Cc: Oder Chiou , alsa-devel@alsa-project.org, Liam Girdwood Subject: [alsa-devel] [PATCH 1/3] ASoC: rt5640: Remove unneeded goto in rt5640_i2c_probe X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Axel Lin --- sound/soc/codecs/rt5640.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt5640.c b/sound/soc/codecs/rt5640.c index de80e89..6bc6efd 100644 --- a/sound/soc/codecs/rt5640.c +++ b/sound/soc/codecs/rt5640.c @@ -2215,14 +2215,8 @@ static int rt5640_i2c_probe(struct i2c_client *i2c, rt5640->hp_mute = 1; - ret = snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640, - rt5640_dai, ARRAY_SIZE(rt5640_dai)); - if (ret < 0) - goto err; - - return 0; -err: - return ret; + return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5640, + rt5640_dai, ARRAY_SIZE(rt5640_dai)); } static int rt5640_i2c_remove(struct i2c_client *i2c)