From patchwork Fri Mar 2 12:55:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 130536 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1238827lja; Fri, 2 Mar 2018 04:55:32 -0800 (PST) X-Google-Smtp-Source: AG47ELuAvYg3r5ujhjhQ5ygLjhRTRzQWOzbBvDI85UYuwp5EkQYYIXHtQs5KTPwXQGJk/oVb30Yh X-Received: by 10.28.4.132 with SMTP id 126mr1394590wme.144.1519995332859; Fri, 02 Mar 2018 04:55:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519995332; cv=none; d=google.com; s=arc-20160816; b=Uajm/JHSoMgHNjt+4V+6mzmy+X3WHLorRwz7CLvOAL01O5a9DQY36KVuOeyxD8UGqR 5JlTU0hzEGyb8yt6yom34il+IIDYUKmOI1A0vM+6KIn+k87EMvAWIISPXvQxckhEA/3A L/vTLcaqIpCYaV+SQW+rsskLuA6358HUb8FR7Kpgc1HzzIp+HfGSLVzv8nWk7WYWhpf9 VzCMwl3OFE4yukZLSM7pPFI2HhQuUGngmJecLWnfYvO4/pvCpRnhu0xWtqS32AFRRlqF IBO5D5MuyF278u5bhCxOJOG+cIjloZRjNmG29xuwUtfRfMRVINFexJ2CVsSfyIvS5e+h XjGw== 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=RZ6D1ggTmLrAaIZJ0nPiUY9n0Hs184bGh6mhpu+nPJQ=; b=NxLXSx6udya1V5u7QmfhNRVJ42Ufr4po6YPAsRBgwnMNOogAtHjc10mNrQFyfdCQtG Dbccmvu1bt34atZZqZRTKkjZ/s0X9lQ4z64idJJ3mH+CpoQ3dB3XPdNrbvamr2tyCm14 EG8OV6/4TI4yZc6Ocka/9Je1IertP+Lc/keninAVbjRghaSaQYMIA5/S+iCpWp1YgzU3 wfH3QNH0bx661DV9sqv2FZYfvta+fsqB6zhroeB7shc+Pfw9P5NDFgz5RhOAvSm72KwG saDNGeeX6hoPGqlImzsMHGin7aI27UaVAKirj6/wN6tjbdxaJ32Lwdrc1T9CtDFArAAu Y12w== 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=c6pkc4NH; 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 l4si878963wmi.8.2018.03.02.04.55.32; Fri, 02 Mar 2018 04:55:32 -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=c6pkc4NH; 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 043C72673D3; Fri, 2 Mar 2018 13:55:31 +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 737682673D6; Fri, 2 Mar 2018 13:55:29 +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 E44F22673CC for ; Fri, 2 Mar 2018 13:55:26 +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=m6UQxCLiAYsnPFYpgEb3txwDb9lgOJjN/cbALTdpFoY=; b=c6pkc4NHQLHy RLJ5sUzoEUbYLC5vSINXjo+8FGskFQEfgY3e7hHPbYgjExpejgPYVEm+kjLWG6Itx3UXn9bdToS9l EO4CmsLMuz5xga1rJiUB6VXiXCO751z+zl21eayyBEqIzu87th+QCH1y3i8sxfN55KlKnDkarPgL8 XSL5o=; 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 1erkDK-0008Pq-Fc; Fri, 02 Mar 2018 12:55:06 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1erkDJ-0004Rj-V4; Fri, 02 Mar 2018 12:55:05 +0000 From: Mark Brown To: John Hsu In-Reply-To: <1519958714-30352-1-git-send-email-KCHSU0@nuvoton.com> Message-Id: Date: Fri, 02 Mar 2018 12:55:05 +0000 Cc: Stephen Rothwell , alsa-devel@alsa-project.org, vinod.koul@intel.com, pierre-louis.bossart@linux.intel.com, liam.r.girdwood@linux.intel.com, YHCHuang@nuvoton.com, WTLI@nuvoton.com, broonie@kernel.org, CTLIN0@nuvoton.com Subject: [alsa-devel] Applied "ASoC: Intel: fix argument error in nau8824 machine" 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: Intel: fix argument error in nau8824 machine 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 3bf045d15f52529e8abe26543dbe22af44efb41a Mon Sep 17 00:00:00 2001 From: John Hsu Date: Fri, 2 Mar 2018 10:45:14 +0800 Subject: [PATCH] ASoC: Intel: fix argument error in nau8824 machine Fix the error: passing argument 1 of 'nau8824_enable_jack_detect' from incompatible pointer type nau8824_enable_jack_detect(codec, jack); ^~~~~ Which expects 'struct snd_soc_component *' but argument is of type 'struct snd_soc_codec *' Reported-by: Stephen Rothwell Signed-off-by: John Hsu Signed-off-by: Mark Brown --- sound/soc/intel/boards/cht_bsw_nau8824.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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/intel/boards/cht_bsw_nau8824.c b/sound/soc/intel/boards/cht_bsw_nau8824.c index 08d0b8128fab..680f2b3a24f9 100644 --- a/sound/soc/intel/boards/cht_bsw_nau8824.c +++ b/sound/soc/intel/boards/cht_bsw_nau8824.c @@ -103,8 +103,8 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) { struct cht_mc_private *ctx = snd_soc_card_get_drvdata(runtime->card); struct snd_soc_jack *jack = &ctx->jack; - struct snd_soc_codec *codec = runtime->codec; struct snd_soc_dai *codec_dai = runtime->codec_dai; + struct snd_soc_component *component = codec_dai->component; int ret, jack_type; /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ @@ -134,7 +134,7 @@ static int cht_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - nau8824_enable_jack_detect(codec, jack); + nau8824_enable_jack_detect(component, jack); return ret; }