From patchwork Tue Aug 22 12:47:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 110654 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp5224773obb; Tue, 22 Aug 2017 05:49:07 -0700 (PDT) X-Received: by 10.28.104.10 with SMTP id d10mr370200wmc.137.1503406147485; Tue, 22 Aug 2017 05:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503406147; cv=none; d=google.com; s=arc-20160816; b=PE2+8ZzlaiK1qmc2Z/t54ipMdeCtLN1+Q7p+JNCtq1TxrgaxHn2UPAs0UV/UleejpT Sl3FD8GDmgLIGfrYpDzWM9zZlqNQLGOdua1I+wdeYYCBBCDIzcl0EO/X5douRv9FLier A2Vw4Cctuv8vzlX59LSwooArTPyeqvkyABWey9kR79nt1sBfHm/AxxnvTdOh1vU3W6Kk x7V+HjveYOi7x3GcgBMP8gXtrxgP6anBr5TQqYVQUKhMYueOk0mdm/2rdU9n077ln/N3 WP7k2CvUgRPZBvRn/iLgQjlFhHZUAPkeBfyTLecYhFKgwcdxD+b0dybDJiR+CGrLoBu5 OyQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=LweAQ3R9Q1B+tEgkYHtyvOBSkY1AyuQeTiwDrxBiAis=; b=rLiqv0QakpQXCemiHAgfkgOgZroZ9oGIgWN8A2Do8zzxkpS/gSIfy0TS0+QijxhkRW 92FFoN/mFrE8stxG9PPvvIjqW2KVZXYpfsmQFSXeWH3grv4ygAQ90+sEQQ9+6c7axqCC Efp7u9txvwcYeKa6aA2RoXeo7BxER7OYQ1h14MlaLbky71P1yYewrAOjYBnwaL6/B1Xc MYjK9kyhGIHh7RHJ3Ts8imFQMsFg3Thf+y70DDz4PNz3RuclTW0FR3psKQSGffYOt5gn vobFeYlRIjyrIucTefDwL8/DDoplHT+znfcZP4hYQZBmS4zX+y6BAQICcc6MxGFhZdTF fHCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=qy+/4Z2X; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id w69si11022223wrb.420.2017.08.22.05.49.07; Tue, 22 Aug 2017 05:49:07 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=qy+/4Z2X; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id DD6F1267654; Tue, 22 Aug 2017 14:47:49 +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 4C5CD267626; Tue, 22 Aug 2017 14:47:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RP_MATCHES_RCVD, SPF_PASS, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id E59A726684C for ; Tue, 22 Aug 2017 14:47:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=4DnIPg5o8sPC36UKoY39PRYBbbejSI9jvwNszj71sYg=; b=qy+/4Z2X2FvL tqfhJBxV5s3wFzqPON+HSxBsiOerhLLuYia5+iT0Li3AYVvsfimDdmG/g766MqTf3VfPaXM33Tq6o hJpyNwXh/Ts+7UAW3vDIZrGJPfdzwjtHeEHOdeh/arXWZCoj+aF9ArZrUlN+pTze6VTUk0r20bM/z PH2MU=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dk8as-0002gQ-8O; Tue, 22 Aug 2017 12:47:42 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dk8ar-0008Uk-PC; Tue, 22 Aug 2017 13:47:41 +0100 From: Mark Brown To: Takashi Iwai In-Reply-To: <20170822115951.6679-4-tiwai@suse.de> Message-Id: Date: Tue, 22 Aug 2017 13:47:41 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call" to the asoc tree 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call has been applied to the asoc tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 2661112fcc5fe555130f383a21e6ce5152570403 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 22 Aug 2017 13:59:46 +0200 Subject: [PATCH] ASoC: simple-card: Remove superfluous snd_soc_jack_free_gpios() call Since jack gpios are managed via devres, we don't have to call snd_jack_free_gpios() at release any longer. Signed-off-by: Takashi Iwai Signed-off-by: Mark Brown --- sound/soc/generic/simple-card.c | 10 ---------- 1 file changed, 10 deletions(-) -- 2.13.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index dfaf48ff88b0..6959a74a6f49 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -104,12 +104,6 @@ static int asoc_simple_card_init_jack(struct snd_soc_card *card, return 0; } -static void asoc_simple_card_remove_jack(struct asoc_simple_jack *sjack) -{ - if (gpio_is_valid(sjack->gpio.gpio)) - snd_soc_jack_free_gpios(&sjack->jack, 1, &sjack->gpio); -} - static int asoc_simple_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -493,10 +487,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) static int asoc_simple_card_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - struct simple_card_data *priv = snd_soc_card_get_drvdata(card); - - asoc_simple_card_remove_jack(&priv->hp_jack); - asoc_simple_card_remove_jack(&priv->mic_jack); return asoc_simple_card_clean_reference(card); }