From patchwork Mon Oct 31 16:02:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026056 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 36019FA3741 for ; Mon, 31 Oct 2022 15:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=f+zchosbcJbvUwAnuEuVcoZt7xVgkRnm3yJeIpc3QjY=; b=mgmMKow5Cgzv4k I2+8yJn5RLxF3fVJAeJAbzlLmJV8AL3l8jfax9BgxooI88R8jQAUP+kB7tV0s2n+2gxNJN/KoBSny KgtadTmYmq8d+MiHMa0v66azEIeoLdpq9pcAjETnRclxtDPTk/vovPCbzdqT/J/uahz8rDDzqEJ+Z vx/ciVarGmhyNkUcK2KTd9WuVsx5e5vR3OdpdOdxLFtXVf4bJgo9SYEBDvxJosb7wP1EvbT9qQu5v dCiIpW6hvU2IvsGby9xv1GvdHm6ZbaeuopL7pVf7r2g7YUUelDnO59LXiQ7Omk45+gAWNWHQTuQIS fs+opcvRiLkxHtBF82vQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2l-00CkzL-Kb; Mon, 31 Oct 2022 15:49:43 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2h-00Ckwv-Mw for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:49:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231379; x=1698767379; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=quE/JPurgz4Mzf+i5ERxx3tZHeSVqlNfHhCtD91heeA=; b=i4SOZeSii2cpZpz1CZDNdxISfbY7V+m2WWUkHd2dttbydU2+7o7NJgD8 NFhskij1G6f7ImBSbkDxzCRjBD2ijpXo8VjOrqAGyX48OXzR4ibstTuYu Syyp9jrLBM9Zr0nMbqcUpwh3Y4yu92SvCv4Vi8F/cM9/COZjBzuI/9rZ2 g5FGLsIGYPBHYV53xFSsp9DR2BaZnt1lxxmSOfK5kta4AbkvYY/MzBzlq aHlC6KeQnr6f0J2TBzTNJm7bwfA9U2kRz6kk5nQLxz26MHZ1/b055PHgn 6C670Xjz0Z6j06lUEFZHO60C53bIx02Y/lyIDhkmrpViXO1XOR2qi47n9 w==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645079" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645079" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178890" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178890" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:35 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 1/7] ASoC: codecs: da7219: Introduce set_jack() callback Date: Mon, 31 Oct 2022 17:02:21 +0100 Message-Id: <20221031160227.2352630-2-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084939_808014_20BD02AE X-CRM114-Status: GOOD ( 10.05 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Amadeusz Sławiński Codec driver for da7219 implements jack detect functionality, but does not integrate it with the framework. Platform component drivers are accessing the functionality through internal da7219_aad_jack_det() instead. Address this by implementing set_jack() for the codec. Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski --- sound/soc/codecs/da7219.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 4746c8700451..7468ee4af2ea 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -2633,11 +2633,20 @@ static int da7219_resume(struct snd_soc_component *component) #define da7219_resume NULL #endif +static int da7219_set_jack(struct snd_soc_component *component, struct snd_soc_jack *jack, + void *data) +{ + da7219_aad_jack_det(component, jack); + + return 0; +} + static const struct snd_soc_component_driver soc_component_dev_da7219 = { .probe = da7219_probe, .remove = da7219_remove, .suspend = da7219_suspend, .resume = da7219_resume, + .set_jack = da7219_set_jack, .set_bias_level = da7219_set_bias_level, .controls = da7219_snd_controls, .num_controls = ARRAY_SIZE(da7219_snd_controls), From patchwork Mon Oct 31 16:02:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026058 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 00390FA3741 for ; Mon, 31 Oct 2022 15:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=O1YQwZKNamNXjHLZBEqV6Hm6B59lkIl3o7bsxC5H0i0=; b=PHkzkFp6XGNV5N 1XG/hY68DKh6W4haQ4V5Y/QOwAyJCZTteti+fkAc83Rs/NZclNoFk1pDSfsUWd7mx6ZmJPmFBqYPA GrSn7N+UFhBaj4bsAGzQNVN6c2iyqcM/Y+1uj1DRvWjje6hcZP9M/GCHevMNg1YxleNlpf9NVmVzl AiNrWkzwd+zGps1LTR57P0308IRxJ7HI1hs1GXNsZqhKy+0MavbXFOD6S9FuKnoHT+TchZRQqUIOy Gnz03BFWvBFDKjOqicnL+U4PMLS0dD7EY37YRC6KkS/yzquujaD2BVexjWo2HnwGypQbCaWYQxmxF 9n1brUmJBM+Roel+5MRA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2n-00Cl0P-ET; Mon, 31 Oct 2022 15:49:45 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2k-00Ckya-73 for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:49:43 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231382; x=1698767382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zVza61ODT+oGt5B80NGqLzU3XwebMfpluHyEQSk6bS8=; b=DySkUeBrXgkEqgex0ER2Ep8R2AZTbO+WP7oE9Z2gXnfA19Jq3b+mT6P+ ODxyC52erVohTMBSd0X+nLqyd9+sr5xmqVPJTTMRsc9oFyqYS4bmkRYxe reovuQqFnzaYx7wsdkXyJi45RzWxLzyhEoDYCyHWR6S5WDOI8Gh9pePwo fw4GUsGSyrCS7aZXnNsuApLsbIZEAVFcF22yTuZe6bbmEM1Yp+1H3K5VS BvUAIcbV621GmGKyDgedVimwuE4brqsgilfADnPFLkLSJIKOlulUxZnbJ gXZ5gJJeZ9y1YFiZ2y8DQP5VG05A6gI6YaBfi0uu1JMt0wHK/hcJQ0lvE Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645091" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645091" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178900" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178900" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:38 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 2/7] ASoC: Intel: Drop da7219_aad_jack_det() usage Date: Mon, 31 Oct 2022 17:02:22 +0100 Message-Id: <20221031160227.2352630-3-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084942_333668_F5F89CD5 X-CRM114-Status: GOOD ( 11.51 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Do not access the internal function directly, do so through component->set_jack() instead. Signed-off-by: Cezary Rojewski --- sound/soc/intel/boards/bxt_da7219_max98357a.c | 3 +-- sound/soc/intel/boards/kbl_da7219_max98357a.c | 3 +-- sound/soc/intel/boards/kbl_da7219_max98927.c | 3 +-- sound/soc/intel/boards/sof_da7219_max98373.c | 4 ++-- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/sound/soc/intel/boards/bxt_da7219_max98357a.c b/sound/soc/intel/boards/bxt_da7219_max98357a.c index 7c6c95e99ade..c593995facaa 100644 --- a/sound/soc/intel/boards/bxt_da7219_max98357a.c +++ b/sound/soc/intel/boards/bxt_da7219_max98357a.c @@ -19,7 +19,6 @@ #include #include "../../codecs/hdac_hdmi.h" #include "../../codecs/da7219.h" -#include "../../codecs/da7219-aad.h" #include "../common/soc-intel-quirks.h" #include "hda_dsp_common.h" @@ -259,7 +258,7 @@ static int broxton_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(broxton_headset.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, &broxton_headset); + snd_soc_component_set_jack(component, &broxton_headset, NULL); snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index 329457e3e3a2..18365ce6bcba 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -19,7 +19,6 @@ #include #include "../../codecs/da7219.h" #include "../../codecs/hdac_hdmi.h" -#include "../../codecs/da7219-aad.h" #define KBL_DIALOG_CODEC_DAI "da7219-hifi" #define KBL_MAXIM_CODEC_DAI "HiFi" @@ -207,7 +206,7 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, &ctx->kabylake_headset); + snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL); ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); if (ret) diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c index 362579f25835..ad4223fee0c5 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98927.c +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c @@ -19,7 +19,6 @@ #include #include "../../codecs/da7219.h" #include "../../codecs/hdac_hdmi.h" -#include "../../codecs/da7219-aad.h" #define KBL_DIALOG_CODEC_DAI "da7219-hifi" #define MAX98927_CODEC_DAI "max98927-aif1" @@ -382,7 +381,7 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, &ctx->kabylake_headset); + snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL); return 0; } diff --git a/sound/soc/intel/boards/sof_da7219_max98373.c b/sound/soc/intel/boards/sof_da7219_max98373.c index e048e789e633..740aa11cb019 100644 --- a/sound/soc/intel/boards/sof_da7219_max98373.c +++ b/sound/soc/intel/boards/sof_da7219_max98373.c @@ -7,13 +7,13 @@ #include #include +#include #include #include #include #include #include #include "../../codecs/da7219.h" -#include "../../codecs/da7219-aad.h" #include "hda_dsp_common.h" #define DIALOG_CODEC_DAI "da7219-hifi" @@ -184,7 +184,7 @@ static int da7219_codec_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, jack); + snd_soc_component_set_jack(component, jack, NULL); return ret; } From patchwork Mon Oct 31 16:02:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026060 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AA4AEFA3741 for ; Mon, 31 Oct 2022 15:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZjDanLNeFxOtfzCyHvAEcpDFzTNOJE7p8o03gyrRims=; b=SP4DeaXIGupFoo v5Nnyoq++5w9eXF1XbJ5ifl5C5DupK44WVT+nYP0mLCPWAQuIWjFZmqGVOqQGQ3lIJipVWN03fxoc KgpM11LqmOiPEMK1F0Z8JdgSvKNZXeb1PFJg8tfqHVfeSlgnkHWGKc9URawb0y90AhGHewIhZ+w4w 5Im2gZMvnNWWMpAZgh+6XqHDwMt62owwnyjrkF1/To+KsPc/bB7ksU4J8LAu/ld6eOPmlnsh1pmcs QlDn6iZJ4x42utw2s5p85KL/n+6o7n+EaErbCLZx7RNnk9dOwtqXkpaF8YxTMchjnNVCUk/teZ9tn 6DHJVKKlecgI8qfiQU0w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2r-00Cl3N-FI; Mon, 31 Oct 2022 15:49:49 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2p-00Ckya-Ic for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:49:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231387; x=1698767387; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PPsobXz7PwRLli089/iR1UgdapPNYt2Ba6WY9lRPD5w=; b=EH6VSN2dndAH3i07NY+XNOSV6o+bbDCECsJeBYRZeBryMTKe7QZYZroq FvLSH9MZoL1G9VCpOxrKyJ0QU3fCCvBPQpdr846kxe1OXspX0LpnXN14Y mHXVK50rwcGFGHF4nEy7DPOwqlTFbPtk1ftjTDjvr+X0gH4bZs/cvw3S7 4Tfs2XZb2lUfxpDnkQ/F//noASIq2VjZ1a8wkf/v+LAXvCK9XJwR6/ouy T5NiOOHlzGPEYxsdIHdo44XkQiqnL8Aj5n56Qu/rqQgWvOsCGoExev0Tr AkGYgmGkfZJQvZC5Y3LHUmKzzqW3aYPL+wKM/DDL2EnIdcARGOfk4jyWB g==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645104" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645104" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178907" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178907" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:42 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 3/7] ASoC: mediatek: Drop da7219_aad_jack_det() usage Date: Mon, 31 Oct 2022 17:02:23 +0100 Message-Id: <20221031160227.2352630-4-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084947_664600_876EBD7A X-CRM114-Status: GOOD ( 11.21 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Do not access the internal function directly, do so through component->set_jack() instead. Signed-off-by: Cezary Rojewski --- sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 3 +-- sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c index 9f22d3939818..97dbb31c412e 100644 --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c @@ -14,7 +14,6 @@ #include #include -#include "../../codecs/da7219-aad.h" #include "../../codecs/da7219.h" #include "../../codecs/rt1015.h" #include "../common/mtk-afe-platform-driver.h" @@ -592,7 +591,7 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component) snd_jack_set_key( priv->headset_jack.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, &priv->headset_jack); + snd_soc_component_set_jack(component, &priv->headset_jack, NULL); return 0; } diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c index cfca6bdee834..db5d2bec7a95 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c @@ -11,10 +11,10 @@ #include #include #include +#include #include #include -#include "../../codecs/da7219-aad.h" #include "../../codecs/da7219.h" #include "../../codecs/mt6358.h" #include "../common/mtk-afe-platform-driver.h" @@ -100,7 +100,7 @@ static int mt8186_da7219_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(cmpnt_codec, &priv->headset_jack); + snd_soc_component_set_jack(cmpnt_codec, &priv->headset_jack, NULL); return 0; } From patchwork Mon Oct 31 16:02:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 054D8FA3743 for ; Mon, 31 Oct 2022 15:50:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+HSXGr/lu5B2FlfslJm3oA0FIRrlj1RW+BhiqXOVYSY=; b=wyji1rPmfl5U2r 24HwWjmwNrFGUBIn7Ce3zkTh4pWH8f5XEc1ebUIBErEFoiAWfupBr5w1qI11lh/94jcahTqrJ1JHf Ju+XuFjoekLU39P6RaG+iZVUx/7G+tyxx94qudI/MsAO+3PMfEQ9H7FXPtaPDkpCbbJPP9HmqtqZX yQzwdHoaio5jFFcaAz1VroH6YKN17pL6/Jo/U/Dq9ydLNyy4Kj48Kp8DfGO55N5VbzuFOzkvuVbta 2VAQVYxjWhBB67tTod3d/ryr12dAVNGWfy2zr70ghYqnKc5+ogN/fIQxD5U3ranqK+3pyYxXpfVqF YNG+V90QixmuafRmMqhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2u-00Cl5M-51; Mon, 31 Oct 2022 15:49:52 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2r-00Ckya-GZ for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:49:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231389; x=1698767389; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kttBWUxr4l7KQq1LsUTjPVeB2x9oemA7VkNv07U5rJ0=; b=SGd6pboxCPgnAWAZKprcY/Up9epogpMihc3ubopccsGabJmy/aENMwDP GgyIy5HXpHzqhrleZT+AF4EWMDSGvuUkK0BsHSL+4hTPVgNvZR9Cf/kpJ RfK5yGijMF1LCHs7bTTRTeDIlGAdMTj++BAbONGAxM2cCsHH5dsoLslxr bWoyxg/Hrc9wuI0lOr3VrDWLxrCA6qscOJcGV4pS3Ec1AvovL6a1n71kG dsuF1Yh41w+/yKwnPFGPEde/XJVGMy1xBefmd81vF3wBtOSN/SRAevYtx lNFVP2/RRrFFJjCgb1B83PSImhVPJdF68W0ZdslGCqwqH0LhCw5g760Nc A==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645114" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645114" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178914" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178914" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:45 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 4/7] ASoC: rockchip: Drop da7219_aad_jack_det() usage Date: Mon, 31 Oct 2022 17:02:24 +0100 Message-Id: <20221031160227.2352630-5-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084949_605225_E8942648 X-CRM114-Status: GOOD ( 10.37 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Do not access the internal function directly, do so through component->set_jack() instead. Signed-off-by: Cezary Rojewski --- sound/soc/rockchip/rk3399_gru_sound.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 2540b9ba37c8..5e52e9d60d44 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -21,7 +21,6 @@ #include #include "rockchip_i2s.h" #include "../codecs/da7219.h" -#include "../codecs/da7219-aad.h" #include "../codecs/rt5514.h" #define DRV_NAME "rk3399-gru-sound" @@ -226,7 +225,7 @@ static int rockchip_sound_da7219_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key( rockchip_sound_jack.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, &rockchip_sound_jack); + snd_soc_component_set_jack(component, &rockchip_sound_jack, NULL); return 0; } From patchwork Mon Oct 31 16:02:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026059 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0BBF2ECAAA1 for ; Mon, 31 Oct 2022 15:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fO/E3VTc4ueLDDQM7ZeQvziFeTvi+fldr9/pGnp7Tq4=; b=FfZP9JKzidFOif l3QOcsu3794dKA8i52uq0mst/oAEwIDxJf6rq4Mcc2tnARMtiwca57l/4tGzOryFemeu+UFLVVtbq +lQVnSqYb6M8bh480yr3fMil+6hQx/GR9RgCAQVYVU+Y+ZjqmbgrJM4WHjFvC7znCa5NpN/9j4Xip wz4cYgQiKSSEnJaamcwkm0HKEM2b0+wmGSgGcaF2tjWGAw0rC9pm55WwIxMP37wJl6HTO/w1HhxgU sHS5mg5L4hOc7j0afbRCLE3V1fFyc3AsVd2l5UvY9GmsB0zZTEqIjUuVGV+IrFonbN4fjTj6WfFIy uLGYyicLP76KCxPJCy3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2w-00Cl70-H2; Mon, 31 Oct 2022 15:49:54 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2u-00Ckya-CH for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:49:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231392; x=1698767392; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rgsxk/6r32PcnLFA3JXrkPIS2/t0MfvefVFGqwYtZGE=; b=P5Q63/byZOS/Q+KIfu9z8MzwhQy4+zEPeJtccZcTG1Ahd2mzgxG53/ae PrFgkda4coYj31QZe3hyTI8z2MLZ9EOyT49JNYT4FHTNk/gDDzQwPDKDI Vbfbj1CxLKhha+X7q531CEE4Sb6MC8NPH0pmUfwiNIltGGJoM/LFAbc3b U6j3yVtJxOZS2p/u+Y9uI7XovBXq9nJpwxIGpfmB+co1JVVFkpD+nGJi5 P+O/8jKBLHPli+q/2/RMBY5cYpSurrhPZR6zj8pMxl5rC0Btetu2e479J wLaKwxjQPY8A9EKvYvn6on+x3fgh6wrJL64hpdSfRLcwzpXKapKLHdYQb g==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645123" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645123" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178930" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178930" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:48 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 5/7] ASoC: amd: Drop da7219_aad_jack_det() usage Date: Mon, 31 Oct 2022 17:02:25 +0100 Message-Id: <20221031160227.2352630-6-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084952_502390_39F38C39 X-CRM114-Status: GOOD ( 10.26 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Do not access the internal function directly, do so through component->set_jack() instead. Signed-off-by: Cezary Rojewski --- sound/soc/amd/acp-da7219-max98357a.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index ef1b4cefc273..375417bd7d6e 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -21,7 +21,6 @@ #include "acp.h" #include "../codecs/da7219.h" -#include "../codecs/da7219-aad.h" #include "../codecs/rt5682.h" #define CZ_PLAT_CLK 48000000 @@ -82,7 +81,7 @@ static int cz_da7219_init(struct snd_soc_pcm_runtime *rtd) snd_jack_set_key(cz_jack.jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(cz_jack.jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, &cz_jack); + snd_soc_component_set_jack(component, &cz_jack, NULL); return 0; } From patchwork Mon Oct 31 16:02:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026062 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0D38FA3741 for ; Mon, 31 Oct 2022 15:50:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wrC/4HKW/67zXEd0J82En+qk8QAL7D9uSa+/Wfy/rGk=; b=4YKaySoEC8lnY1 wemOtMswynEpaYGmorQ2S9Cd7FyA/GBDfRtGbRlAvJSVawnEVj8l2AWyWsp7gNtTuDXT1+OesLJVv l/PNqqOSJ2qgFiGfRkXIsJLZDs2hCS4bWT8ou5vR3miEIqYzVaDGOXf+C2DG9siKbpnXx0Vun0DXw vhk59BFJ3CDGvrhuB80FAP1WKZUZVinbs+x3v7eI5H2ePTcStiBLIfm2cM0VVyqDsjcBpv9KAvEaa lrp6N+tdT7RJIq4xMhurdFSIKynWerJ6VuFukmgHsvREr2kydg13Pfi+CN7T2MGu4HjgsAaoHiYU6 pAuSEdexrEbN3V8RMxIA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2z-00ClA2-WF; Mon, 31 Oct 2022 15:49:58 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX2x-00Ckya-1x for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:49:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231394; x=1698767394; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tT9hePL8GvHil/QRyJUeqhX3qTF0HyqiJPv0VHYrHvk=; b=cL8ij7CIp3CKXdv7CCWY4PzsTM731RzhxbNlXmimZICNaD4NZ6rGH2qo zI9tGSrZ2LB0/Oo8dpJxbguYKBdgUWhDb/H+h5N7I+JbylWZpUq5cKoCC SeIUMTJzFCd52pFuk9ZMEueJ9245OOrQqZgZJFMWbzf9M6AkOWGWGKsDm RQdoOM2b/Yp2P5BEM/+io0Xvw6nyqpEuSIu7g+FQNv1i82aAxaapHxX3S xyV61syEdSlER1TD7ce4PRlHOZzUcM9ibnmarxvXLNe3BrIby6X9dWHis KbbOjPulHgkUGzQtTYt8C2zKiMBeSl/FHdOrKWtPzNBNjNWxFChi0MnSJ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645139" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645139" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178940" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178940" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:51 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 6/7] ASoC: Intel: avs: Drop da7219_aad_jack_det() usage Date: Mon, 31 Oct 2022 17:02:26 +0100 Message-Id: <20221031160227.2352630-7-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084955_148771_0FA0832B X-CRM114-Status: GOOD ( 10.26 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org Do not access the internal function directly, do so through component->set_jack() instead. Signed-off-by: Cezary Rojewski --- sound/soc/intel/avs/boards/da7219.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/intel/avs/boards/da7219.c b/sound/soc/intel/avs/boards/da7219.c index 503a967a1c3a..ad86cef101cc 100644 --- a/sound/soc/intel/avs/boards/da7219.c +++ b/sound/soc/intel/avs/boards/da7219.c @@ -16,7 +16,6 @@ #include #include #include "../../../codecs/da7219.h" -#include "../../../codecs/da7219-aad.h" #define DA7219_DAI_NAME "da7219-hifi" @@ -110,7 +109,7 @@ static int avs_da7219_codec_init(struct snd_soc_pcm_runtime *runtime) snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); - da7219_aad_jack_det(component, jack); + snd_soc_component_set_jack(component, jack, NULL); return 0; } From patchwork Mon Oct 31 16:02:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Cezary Rojewski X-Patchwork-Id: 13026063 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1C761ECAAA1 for ; Mon, 31 Oct 2022 15:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3088G9LGlLEyoK/qxATYQDBSJHT8nLq2zA6a+MVVne4=; b=NaN68ZiltDtGt/ HOhvyuWjtPABBPSov6M8PnwNDkeZHLWXlcwf/SnqtIAfM/N7OpIWzgbogjYkwd/oWuq+PRnZm0UaN 4hyIvis9GesTOB09t4xAmeoKRtYiy/EKhp7h4G4qkJ5OVl5yviURv1AfsoXhtFxMukFXPEVniyRTg qpLb75aEJgfNiRFipYCr5RhtNYXI/Ba2IjMSDxNkRoXZ1aK48ATdI9FApMIKbRP5WbvImF1f7qECq WGGSndsSXKeBj4yw2/D1tSUJzan5P48pAsZlTH4Plk4maAN9RtdgPvxhfetsrC12tgf78YfaXPWiS GrskYhmL3cLABeagGzhQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX36-00ClGA-SQ; Mon, 31 Oct 2022 15:50:04 +0000 Received: from mga12.intel.com ([192.55.52.136]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1opX31-00Ckya-6U for linux-rockchip@lists.infradead.org; Mon, 31 Oct 2022 15:50:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231399; x=1698767399; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Fql4FZO7uX5rRWQgwds/n4gQKmqe/m9nuV8VPMYmhOc=; b=natOvrZva3/J+R9qKhNpWgGd+1iHSGp+GEhRE4yR1rBCDL+AquGuZf6X /X4w6XB8EVSWsLwhVluFlrppuc3R9lIbqQKbk4g7YcFxaW95vas/ukATC Ex5SPRL5GmTqGFR7rvc3oqGC3xx5sP6PMuJl5ZQpGuGie5b1wK2TuLHEd nMM1f8xLezd0+m7N7acSNQuMK98fVqz255+TYIHZZVktSk5nK4+UCjUzB FZDDJYE9o7umD++X6Lk3pA1mbST7r4nmJRU5Dm7tCXwYY8iYehIqDt54h /hj11LUqJCY7KnAbpU+CvmOViYU4fTYQMNR7VB/Q6IZirF+5Q4dWitDmK Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="288645157" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="288645157" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Oct 2022 08:49:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="776178958" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="776178958" Received: from crojewsk-ctrl.igk.intel.com ([10.102.9.28]) by fmsmga001.fm.intel.com with ESMTP; 31 Oct 2022 08:49:55 -0700 From: Cezary Rojewski To: alsa-devel@alsa-project.org, broonie@kernel.org Cc: tiwai@suse.com, perex@perex.cz, amadeuszx.slawinski@linux.intel.com, pierre-louis.bossart@linux.intel.com, hdegoede@redhat.com, lgirdwood@gmail.com, heiko@sntech.de, linux-rockchip@lists.infradead.org, Syed.SabaKareem@amd.com, Vijendar.Mukunda@amd.com, AjitKumar.Pandey@amd.com, jiaxin.yu@mediatek.com, trevor.wu@mediatek.com, Cezary Rojewski Subject: [PATCH 7/7] ASoC: codecs: da7219: Do not export internal symbols Date: Mon, 31 Oct 2022 17:02:27 +0100 Message-Id: <20221031160227.2352630-8-cezary.rojewski@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221031160227.2352630-1-cezary.rojewski@intel.com> References: <20221031160227.2352630-1-cezary.rojewski@intel.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221031_084959_285663_497F9FBC X-CRM114-Status: UNSURE ( 9.32 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+linux-rockchip=archiver.kernel.org@lists.infradead.org From: Amadeusz Sławiński With all users utilizing component->set_jack(), there is no need to export da7219_aad_jack_det() function. While at it, remove exports from all other functions as well. Signed-off-by: Amadeusz Sławiński Signed-off-by: Cezary Rojewski --- sound/soc/codecs/da7219-aad.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sound/soc/codecs/da7219-aad.c b/sound/soc/codecs/da7219-aad.c index bba73c44c219..9bf8d73b4f58 100644 --- a/sound/soc/codecs/da7219-aad.c +++ b/sound/soc/codecs/da7219-aad.c @@ -43,7 +43,6 @@ void da7219_aad_jack_det(struct snd_soc_component *component, struct snd_soc_jac DA7219_ACCDET_EN_MASK, (jack ? DA7219_ACCDET_EN_MASK : 0)); } -EXPORT_SYMBOL_GPL(da7219_aad_jack_det); /* * Button/HPTest work @@ -930,7 +929,6 @@ int da7219_aad_init(struct snd_soc_component *component) return 0; } -EXPORT_SYMBOL_GPL(da7219_aad_init); void da7219_aad_exit(struct snd_soc_component *component) { @@ -948,7 +946,6 @@ void da7219_aad_exit(struct snd_soc_component *component) cancel_work_sync(&da7219_aad->btn_det_work); cancel_work_sync(&da7219_aad->hptest_work); } -EXPORT_SYMBOL_GPL(da7219_aad_exit); /* * AAD related I2C probe handling @@ -972,7 +969,6 @@ int da7219_aad_probe(struct i2c_client *i2c) return 0; } -EXPORT_SYMBOL_GPL(da7219_aad_probe); MODULE_DESCRIPTION("ASoC DA7219 AAD Driver"); MODULE_AUTHOR("Adam Thomson ");