From patchwork Thu Mar 1 18:06:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130361 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp3112725edc; Thu, 1 Mar 2018 10:07:35 -0800 (PST) X-Google-Smtp-Source: AG47ELv2HIXa1s2plVMelZb0zjcIcept73Ergw3rv8OOizL8CE+OU4mQiFLa6DSBnRNwxoFZ6EWO X-Received: by 10.223.155.142 with SMTP id d14mr2714529wrc.93.1519927655467; Thu, 01 Mar 2018 10:07:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519927655; cv=none; d=google.com; s=arc-20160816; b=x9yzUS4jXtxpiD+M9ebnXQkPEUPaxgMSN00W4C1soyUiuJ6oQtGz4Etdk4pECydnvB OjDzab0i4j2dMQqvlnUh4riRkdlF9M6YBAjsj8fI0bNvtzBzkuE9lGRTzqVKj8l6rsxq u/dEPFGemAgh+xl4pLpzGIjZ/g9eN9UlIkKEUOqVlJt/nPid96+9guCuzoUT1hByW6Ro GQnd+DiN4ow71F381T4Cp2SEN+sMjcHJMrPvaG/Fi7zGDSZjDw3t94DzOkl8N3BIKgMh VwiPdknOKASLRC6rK7fmr0Plq3LmFRmzihoRnyeGNkusx8EgmU1y3n7tmspjxrrD/L+e cZmw== 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=Hiip4z67bSO3BfD/uCZLLLu6CXblw6RpPHZ5FudQgDQ=; b=Z1P6ui1pNELVR9yr7Yl87oHZR2lu5FcxAaKrOrxtY2Zc1Qu0rcsqQwmqMXF1bIxDaF sf6F8J9v2SifJVu02QpKX01HA7BFWAvz/cD4TPpEPQJ2CGT9VtOKbitbCLf53Fo+k/wk JXMU5tDkKqiskmL31f3yBDSlI6O6jQuN4MzA5c2tY0SfQy1lyAYOHEBAQkBcp7gEf0++ J2fgPwj8jSsgI4PDVJMfpx/0AFk2a0kBYCcnR+R0HG7TJr4BOfSZ0c4sIM3gS+AVGYFE TAWVZFDDtNlHfBnsGRaxZkBzV61PdYJyLWVTcnZ525LjOPBIxOwO13zWbO2+bV+yT9Cq f+tg== 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=Gc7p0oAM; 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 76si3001127wmf.108.2018.03.01.10.07.35; Thu, 01 Mar 2018 10:07:35 -0800 (PST) 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=Gc7p0oAM; 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 D3159267B41; Thu, 1 Mar 2018 19:07:04 +0100 (CET) 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 27FDC267B3F; Thu, 1 Mar 2018 19:07:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS, T_RP_MATCHES_RCVD 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 197D0267B35 for ; Thu, 1 Mar 2018 19:06:59 +0100 (CET) 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=tqcjEgcTOCyr/+xDuoVxEl+5OaPsCCSvueCi+r2jMzc=; b=Gc7p0oAMhwLB DN2i6Xe5eMksYVKarsnPHU5iF0uMDVzIWis7bO105T60MvBjB7/X/TDgAXVwGvAbIVoPA4dOVgAKZ jIA+P408Izn6XCL0ilzc2U8TNoB2GQ8n8SbBTlBpwFyUP8CSYIH4kyoFx/h7qCKIDSY0A3ejTVUAn /EejI=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1erSbT-0005WN-0n; Thu, 01 Mar 2018 18:06:51 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erSbS-0005qA-HS; Thu, 01 Mar 2018 18:06:50 +0000 From: Mark Brown To: Hans de Goede In-Reply-To: <20180222170738.8508-5-hdegoede@redhat.com> Message-Id: Date: Thu, 01 Mar 2018 18:06:50 +0000 Cc: Oder Chiou , alsa-devel@alsa-project.org, Takashi Iwai , Mark Brown , Carlo Caione , Bard Liao Subject: [alsa-devel] Applied "ASoC: rt5651: Use standard component set_jack callback" 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: rt5651: Use standard component set_jack callback has been applied to the asoc tree at https://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 6f0b819ae2b36614a514824c622ac0e02650b718 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Sun, 25 Feb 2018 11:46:45 +0100 Subject: [PATCH] ASoC: rt5651: Use standard component set_jack callback Use the standard component set_jack callback instead of defining a codec private API for this. Tested-by: Carlo Caione Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- sound/soc/codecs/rt5651.c | 6 +++--- sound/soc/codecs/rt5651.h | 2 -- sound/soc/intel/boards/bytcr_rt5651.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/codecs/rt5651.c b/sound/soc/codecs/rt5651.c index c9698229fc33..030889143249 100644 --- a/sound/soc/codecs/rt5651.c +++ b/sound/soc/codecs/rt5651.c @@ -1593,8 +1593,8 @@ static irqreturn_t rt5651_irq(int irq, void *data) return IRQ_HANDLED; } -int rt5651_set_jack_detect(struct snd_soc_component *component, - struct snd_soc_jack *hp_jack) +static int rt5651_set_jack(struct snd_soc_component *component, + struct snd_soc_jack *hp_jack, void *data) { struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component); @@ -1658,7 +1658,6 @@ int rt5651_set_jack_detect(struct snd_soc_component *component, return 0; } -EXPORT_SYMBOL_GPL(rt5651_set_jack_detect); static int rt5651_probe(struct snd_soc_component *component) { @@ -1762,6 +1761,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt5651 = { .suspend = rt5651_suspend, .resume = rt5651_resume, .set_bias_level = rt5651_set_bias_level, + .set_jack = rt5651_set_jack, .controls = rt5651_snd_controls, .num_controls = ARRAY_SIZE(rt5651_snd_controls), .dapm_widgets = rt5651_dapm_widgets, diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h index 8f128d057ff0..f3158488fc89 100644 --- a/sound/soc/codecs/rt5651.h +++ b/sound/soc/codecs/rt5651.h @@ -2080,6 +2080,4 @@ struct rt5651_priv { bool hp_mute; }; -int rt5651_set_jack_detect(struct snd_soc_component *component, - struct snd_soc_jack *hp_jack); #endif /* __RT5651_H__ */ diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index b6bf92191b9a..afb27e5e6756 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -370,7 +370,7 @@ static int byt_rt5651_init(struct snd_soc_pcm_runtime *runtime) return ret; } - rt5651_set_jack_detect(codec, &priv->jack); + snd_soc_component_set_jack(codec, &priv->jack, NULL); return ret; }