From patchwork Tue Jun 28 08:40:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Axel Lin X-Patchwork-Id: 9202301 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5810F6074E for ; Tue, 28 Jun 2016 08:41:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48AA2285F4 for ; Tue, 28 Jun 2016 08:41:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3CD96285FB; Tue, 28 Jun 2016 08:41:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D791285F4 for ; Tue, 28 Jun 2016 08:41:17 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D90C9265938; Tue, 28 Jun 2016 10:41:15 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 84EB826581A; Tue, 28 Jun 2016 10:41:07 +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 2F83A26584D; Tue, 28 Jun 2016 10:41:06 +0200 (CEST) Received: from mail-pa0-f65.google.com (mail-pa0-f65.google.com [209.85.220.65]) by alsa0.perex.cz (Postfix) with ESMTP id 5DB222651E3 for ; Tue, 28 Jun 2016 10:41:00 +0200 (CEST) Received: by mail-pa0-f65.google.com with SMTP id us13so1116987pab.1 for ; Tue, 28 Jun 2016 01:41:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ingics-com.20150623.gappssmtp.com; s=20150623; h=message-id:subject:from:to:cc:date:mime-version :content-transfer-encoding; bh=RlqLvqF6WbaKc3lTQrWnubgjfBN/7qdoSpL1UPF1w4o=; b=phVdcCo+hJfam+AUtY0SgK/IDLKo98NBApFV9taOljDPFw1QPS56tBiX2AQN9ePfte 5F8Ovda5M3UO8Qu9GVJq6jpZImEfSetduvWGdlzaxwVbe90c1DewP/zWivjuGLaNkyGv k6fo6tt4JWrpReNXKV64plz0RzhA5CIlHs3pKWx5sKZ0Ky5AMaj3nQI5OgOnCRTMPLME nTGxC2d4PTGN+T0ceuFU3fgsvwU/Pd6+fJbkS8kBr+LJ28NsexmoVdFYlEjoO/uCylQC JkNcybJD4/NUen+dXrqaA8UmvxK1SsA6LqoJE6vDXEzZg5vls5o/FDeMegjR+ky+MtvG GUQA== 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:mime-version :content-transfer-encoding; bh=RlqLvqF6WbaKc3lTQrWnubgjfBN/7qdoSpL1UPF1w4o=; b=MBQSDJLxKe81A0KR4xECA9OTr33+GwbAeoZIEbUZVRkPiOrmwEW0DOZCiIvKetslw6 mS8lACwrWU6eevkkJUaYs0FV68XAPYNbCcLTnm3g+DXovDVszB9KmlMvep1U5qw9KvQQ OvtmZsDEmqk4ELwZ6xU7MDQKEzfmZ11/4E41Ua78LQ5WcWnzA9k8h82o/bhPq1PKaMhp 5QljmSckjZ6ZUwcMOMQdV3HoIKNG0ZRgiy9QgWHLyIJ23UoQzSzivwbT8G1aM+a45NEy bNW6L4sEafSSvcQ6XkwLDESxQwcb3Ep5207ROpWVa+Ocyvq3K59Gb/oNoQhSDIgUFwjV xQEA== X-Gm-Message-State: ALyK8tKx93mHUd9CCMOw92SPAYLXHNGlftgOgtoZUhhU90PjatepLlutHM27EkjcCU1O7g== X-Received: by 10.66.180.40 with SMTP id dl8mr2882400pac.131.1467103258795; Tue, 28 Jun 2016 01:40:58 -0700 (PDT) Received: from [192.168.1.168] (118-167-23-90.dynamic.hinet.net. [118.167.23.90]) by smtp.gmail.com with ESMTPSA id t128sm5190877pfb.14.2016.06.28.01.40.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 01:40:57 -0700 (PDT) Message-ID: <1467103218.25747.1.camel@ingics.com> From: Axel Lin To: Mark Brown Date: Tue, 28 Jun 2016 16:40:18 +0800 X-Mailer: Evolution 3.16.5-1ubuntu3.1 Mime-Version: 1.0 Cc: Brian Austin , alsa-devel@alsa-project.org, Liam Girdwood , Paul Handrigan Subject: [alsa-devel] [PATCH] ASoC: cs35l33: Remove unnecessary free_irq call 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 Current code uses devm_request_threaded_irq() so it does not need to explicitly call free_irq() in .probe error path and .remove. Signed-off-by: Axel Lin Acked-by: Paul Handrigan --- sound/soc/codecs/cs35l33.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c index 55c1f75..90dc743 100644 --- a/sound/soc/codecs/cs35l33.c +++ b/sound/soc/codecs/cs35l33.c @@ -1195,7 +1195,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client, dev_err(&i2c_client->dev, "Failed to enable core supplies: %d\n", ret); - goto err_irq; + return ret; } if (cs35l33->reset_gpio) @@ -1251,7 +1251,7 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client, if (ret < 0) { dev_err(&i2c_client->dev, "%s: Register codec failed\n", __func__); - goto err_irq; + goto err_enable; } return 0; @@ -1259,8 +1259,6 @@ static int cs35l33_i2c_probe(struct i2c_client *i2c_client, err_enable: regulator_bulk_disable(cs35l33->num_core_supplies, cs35l33->core_supplies); -err_irq: - free_irq(i2c_client->irq, cs35l33); return ret; } @@ -1277,7 +1275,6 @@ static int cs35l33_i2c_remove(struct i2c_client *client) pm_runtime_disable(&client->dev); regulator_bulk_disable(cs35l33->num_core_supplies, cs35l33->core_supplies); - free_irq(client->irq, cs35l33); return 0; }