From patchwork Wed Mar 4 09:33:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lars-Peter Clausen X-Patchwork-Id: 5934501 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BC0DABF440 for ; Wed, 4 Mar 2015 09:45:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D769420149 for ; Wed, 4 Mar 2015 09:44:59 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id AA11520120 for ; Wed, 4 Mar 2015 09:44:58 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id BAEC026530B; Wed, 4 Mar 2015 10:44:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org 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 3A089265338; Wed, 4 Mar 2015 10:35:58 +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 8B3FC265335; Wed, 4 Mar 2015 10:35:57 +0100 (CET) Received: from smtp-out-196.synserver.de (smtp-out-198.synserver.de [212.40.185.198]) by alsa0.perex.cz (Postfix) with ESMTP id 71E72265019 for ; Wed, 4 Mar 2015 10:34:03 +0100 (CET) Received: (qmail 2442 invoked by uid 0); 4 Mar 2015 09:34:02 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: lars@metafoo.de X-SynServer-PPID: 991 Received: from p4fc46457.dip0.t-ipconnect.de (HELO lars-adi-laptop.analog.com) [79.196.100.87] by 217.119.54.96 with SMTP; 4 Mar 2015 09:34:02 -0000 From: Lars-Peter Clausen To: Mark Brown , Liam Girdwood Date: Wed, 4 Mar 2015 10:33:32 +0100 Message-Id: <1425461626-21103-18-git-send-email-lars@metafoo.de> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1425461626-21103-1-git-send-email-lars@metafoo.de> References: <1425461626-21103-1-git-send-email-lars@metafoo.de> Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen , Anatol Pomozov , Kuninori Morimoto , Stephen Warren , Vinod Koul , Jie Yang , Peter Ujfalusi , Yang A Fang , Jarkko Nikula , Sean Cross , Dylan Reid , Jarkko Nikula Subject: [alsa-devel] [PATCH 17/30] ASoC: z2: Register jacks at the card level 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 X-Virus-Scanned: ClamAV using ClamSMTP The jacks are card level elements so use snd_soc_card_jack_new() instead of snd_soc_jack_new() to register them. Signed-off-by: Lars-Peter Clausen --- sound/soc/pxa/z2.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index 76ccb17..bcbfbe8 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c @@ -143,13 +143,9 @@ static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_disable_pin(dapm, "MONO1"); /* Jack detection API stuff */ - ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET, - &hs_jack); - if (ret) - goto err; - - ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), - hs_jack_pins); + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET, + &hs_jack, hs_jack_pins, + ARRAY_SIZE(hs_jack_pins)); if (ret) goto err;