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: 13026066 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 B638FECAAA1 for ; Mon, 31 Oct 2022 15:51:08 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 395711672; Mon, 31 Oct 2022 16:50:16 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 395711672 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231466; bh=quE/JPurgz4Mzf+i5ERxx3tZHeSVqlNfHhCtD91heeA=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=OKXaru1f9ScFloHKP5+qYY84ooavRLPHYiflQ3PvmSkSkdP2jycL7m0vZkwMEUY4z oOU0sm7SiHeFFS4nqSKf2EjdeDcwX6dT+k0GT+cPunVtOy5kFbPCnzuYzjC8u+xpIa xeKRGHyFGVFkclzFn7m9hn5ScOtzLmpN0dfn7msQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 1111FF800CC; Mon, 31 Oct 2022 16:49:55 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3DA81F80256; Mon, 31 Oct 2022 16:49:51 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 3DDC3F800CC for ; Mon, 31 Oct 2022 16:49:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 3DDC3F800CC Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="cgRx2F7b" 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=quE/JPurgz4Mzf+i5ERxx3tZHeSVqlNfHhCtD91heeA=; b=cgRx2F7bi2sxil9364Z4C0G+/gkGU+80i05+JPoDLpaJkpNvo9GN/Qgz sGAT08UaSJsLY0ZhDYByAE6wrb2ebJ7959jz0xhhymFdkmBtQhnPLa3xC wRjte3GA1Wkra9mWW74jT6bL4+2NGtrobHPI8yTppWTJ6uDb7w4S9lWmQ +s3QEWVwUZ+gj6EVW200dbfR0vJ6Z+KCNPxBzXBaUcylofdnBgHxhD0oy BxgAnRvMzcZEnAWGnCdr8ZQLMa3l5S8DAjj/uarUk1uH4HZvMcsih/PS2 KS/e87zkfr4QDResRpUB/kbJaXYyUo2gMlbK4SfBYBx3pR9txL/mne+bU Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="308929901" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929901" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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: 13026068 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 B1817FA3741 for ; Mon, 31 Oct 2022 15:51:42 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id BBB251676; Mon, 31 Oct 2022 16:50:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz BBB251676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231492; bh=zVza61ODT+oGt5B80NGqLzU3XwebMfpluHyEQSk6bS8=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=hjfKwpTH1A+rJD74Bf/otTDXe2ZJGNqZ03YvL1S7a7yoXNnkTQFFHYgtWxrTug2Qn 7R95pSC1Sqfya1OnHsbFyvmO/AnSL0pISB6gywxgobWGso68JmauwxtCH/xNzLBnQV jVpHOhcRa6uJYmk2RyhOIvTvwTeRqDB4utWEXRLQ= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 16509F80163; Mon, 31 Oct 2022 16:49:58 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E923EF80553; Mon, 31 Oct 2022 16:49:55 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id BD404F80163 for ; Mon, 31 Oct 2022 16:49:48 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz BD404F80163 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="cBKXBPrr" 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=zVza61ODT+oGt5B80NGqLzU3XwebMfpluHyEQSk6bS8=; b=cBKXBPrr7fNrXN5RWjduSi3w09uuoKSX8dgT5VIfRg4FWFbaK+EjJPKs GgeNZdTALhKYJUku23M9aK9lTSrOuyf7wZl/15IPtBENhwLzTWiPijB0D MGStAfMAQY6wPPj1+zP4zhGYlKU/OeXohYXjQum4AjWAXEU5ObDOktDNN 1YnHNhwzSfrppd90n5kxDdxYdPcBYvaNN1dV6BJ1XgsJ1tm53H39PhwzY SGW2iRF1PGH+0I2clc7u6SIjmmgYi42aPqqIO1ik/fcr8Mv7o3+WVBkaz KUFAQrlftoZ3GIAwx5J0Dhf6Qr8RdGpvt+fWC5K3u08sxYT+4qdhpPDYg w==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="308929912" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929912" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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: 13026067 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 6BE7DFA3741 for ; Mon, 31 Oct 2022 15:51:39 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 459061681; Mon, 31 Oct 2022 16:50:47 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 459061681 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231497; bh=PPsobXz7PwRLli089/iR1UgdapPNYt2Ba6WY9lRPD5w=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=U/pHu77az6KS0sqwuxbTbvUNs5EgcipA6xf9I3IyA6zSHP3XGHMURCVDx/h5G3H39 /O0GcJ2ihPVaVG/hd4A5kygYLroiSlluAW0BsQsU8EsB/EGF/1advRG/ztVWX5VjQQ qqLQkST1G3G0IaCEWGQkWz/ty+kgjU8/JaF1IHmo= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id F2898F80564; Mon, 31 Oct 2022 16:50:00 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 31D5FF80557; Mon, 31 Oct 2022 16:49:57 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 2939DF800F3 for ; Mon, 31 Oct 2022 16:49:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 2939DF800F3 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="iCq0tQBt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231391; x=1698767391; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PPsobXz7PwRLli089/iR1UgdapPNYt2Ba6WY9lRPD5w=; b=iCq0tQBtSvLlDWOzK/U03C+UfehYYv9iAovYn6U1zm+/8xhtQYh/4zyN T5IAnuDPb46P9yh0AFzdilGOkh5N2SMr07qwD+O/gdbNLP+7+uovZBS0F yx8W+2xcWSoGHOkNrLsaHqRH/ULj1xS1YkoroAQFLxuWV6HVDWStZR+Eq KSTWVhb0i/eGORYhUUHuJC7UMzqBN5Mss4VpBLxDQDkxY6PKmqaWPIIlH nhNH9TbTYD5yr56YLnjcQOdZTl3C5XyhR/MF+ptyTh3IOmck2j0Vz0kUc CqxXELHmuAn8KyhkgT5FQs6/lLxVUo/Nvqx6waq2tiGLgZqRqFSomnoBF g==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="308929928" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929928" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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: 13026073 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 D1C32ECAAA1 for ; Mon, 31 Oct 2022 15:52:08 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 060D21666; Mon, 31 Oct 2022 16:51:17 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 060D21666 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231527; bh=kttBWUxr4l7KQq1LsUTjPVeB2x9oemA7VkNv07U5rJ0=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=XSQeffk+1wcx/ARXNLPkB8HUUxPFCcYXWWA6juzYn37Alb71pzd1KueZj2AP0Sh5N 7cGf4y8h3KS9IESTYTOViifKbjNDo1GS9Chvc6lUgWzTkeI+ewylBTM5xMsUv4Rv0C dy38zkLVwwdyngRVzjT9CeS96k4hgrDSuPnr1p3M= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 90349F80578; Mon, 31 Oct 2022 16:50:04 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 09222F8055B; Mon, 31 Oct 2022 16:50:00 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 6E78BF802E8 for ; Mon, 31 Oct 2022 16:49:50 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 6E78BF802E8 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="gFMjcdk9" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231391; x=1698767391; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kttBWUxr4l7KQq1LsUTjPVeB2x9oemA7VkNv07U5rJ0=; b=gFMjcdk9bwmHbrXMbKnHE1wBm92vLXIcd5io5bGAK99fbHjQ1WjRxwFA 1J8sPx9zpH1VMJMYD7zhbZd0qHjMwf12EfRGRwAd8pOrvTpbG2wZ1WR5J wiJhVjjW4tK/iQLzgIfDH1A1W8GiX6qaSh5RjmhKDkq7f0xOotUpGZsBS 3R+g1NJeJD7p3xfVH4FfCmPJj/cm7Nc9fsAvSvlauM9UbkECcuMqwS8Ax WKnU+A1KCJxwIRdd9ILc/Zv/RdyVynp54aCR4LfEiHM2GmfccfBsne47c T+09jsFOS4EyZe0uCU7P7wx9LWuA6hVokhexvxe88AXkMoLVAVRhoUFoG w==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="308929940" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929940" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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: 13026072 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 98062FA3743 for ; Mon, 31 Oct 2022 15:52:01 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 97F3E1664; Mon, 31 Oct 2022 16:51:09 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 97F3E1664 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231519; bh=rgsxk/6r32PcnLFA3JXrkPIS2/t0MfvefVFGqwYtZGE=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=H6RTtCqeqAvAHg/XlHBo1LdPcaXqON8d5xlGXvHVbC1Yq3ECta5fxcHlWpDz45kK6 F7bGLTOk5eqyuxTso3UjEZdO4E9U5mRLyajxIqIYbH4UzjIxl4WBJZMhB+jpP1Z9iK Ic4iDzFdn3VvWbCH3u36cYVag+Zqy0AVAVji2YSM= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2206BF80568; Mon, 31 Oct 2022 16:50:04 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E9EE2F8055C; Mon, 31 Oct 2022 16:50:00 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1B1F0F8015B for ; Mon, 31 Oct 2022 16:49:51 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1B1F0F8015B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Bad1yQpz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231393; x=1698767393; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rgsxk/6r32PcnLFA3JXrkPIS2/t0MfvefVFGqwYtZGE=; b=Bad1yQpz2Vro6/D2Dt2zjFhwca2MjrQs9jfPrOy8TvDVZeChjJxMCwK1 iyTMTx//7dmzh70HVYwpnpgWrSE1NrdNS7Gx/BORrQmYhUs+pldLUq2bC DK5aSLhDhxi3D0yvxAhPrKceCU5o04oEujHTjr1iyETrwVggsW9HVakWF 9f6aiNfJFhhYbGwCtAoTByfq6SM6/xPNGntAQeX015tC7EzMMjiioKGAS vAqIZinesm2JO1oATzg87JCwYR2xGEozAEtyR1mVnaUDmx20svUe+c0oF 043Kn/Hx3Ni8rYsFEG9n0dSRt/3EgFBFGmzsoNFdVCOeqtXTZ/0JMqFvH Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="308929958" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929958" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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: 13026074 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 ED742ECAAA1 for ; Mon, 31 Oct 2022 15:52:27 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 246DD1682; Mon, 31 Oct 2022 16:51:36 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 246DD1682 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231546; bh=tT9hePL8GvHil/QRyJUeqhX3qTF0HyqiJPv0VHYrHvk=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=NroDFcnHOXG2gzQEqqp5slJ/xUznYAfMhRbQVLLXKAVeeXAmaMe9NMj2D4gaT2zZW fnL5n9AIh0WEeax+iL1Ntj1k+aVay+X2NWCieKTZE1/SNEAQIDgsVtYFJlD7FtqzRe RMCoRNKym1KRi+2IzavpfLumZvNJ6I2VSrLKT3dE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 3D589F80579; Mon, 31 Oct 2022 16:50:05 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 192A5F80549; Mon, 31 Oct 2022 16:50:01 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 4BD3FF80549 for ; Mon, 31 Oct 2022 16:49:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 4BD3FF80549 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="HCuYRLe0" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1667231396; x=1698767396; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tT9hePL8GvHil/QRyJUeqhX3qTF0HyqiJPv0VHYrHvk=; b=HCuYRLe0x7UtzUCKiG23k1/5TiFdHt+NSy0efpXPWLbalH1PgvuRwDvX c6aHOlxph/cjJna0SFdbzMAZC9OC7tAdUXJSEDLLzjfPd9TP4ytxJxPHG A3zvVNqnOCYyY2hnBvVKLllZ7QFN4YC5O0lfgFzItb27GJylW8QzJ10uw CpiUeKmrFxeykdkPxDlWeeRQklob1L/8aUWOAggn9eeQBbqAqWdIa4W9D xfQez3bkveKbuMbemnw6U/xAWMf0X+QySYx4m8HCMCJpuTIbpIAzQwZy2 +2jWArud3AcPZLJxy84OP2li+CNxa/hj/Jne2pvbe/jSStGryKYY75PDj g==; X-IronPort-AV: E=McAfee;i="6500,9779,10517"; a="308929968" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929968" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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: 13026075 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 EE7B7ECAAA1 for ; Mon, 31 Oct 2022 15:52:46 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 1D1151675; Mon, 31 Oct 2022 16:51:55 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 1D1151675 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1667231565; bh=Fql4FZO7uX5rRWQgwds/n4gQKmqe/m9nuV8VPMYmhOc=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=D+wkmWh5pjTnxLGZLDhH52DNxmE9co008MWI5ik8/NJqcQFsWjEnbAsU6uk2Z2y/a HxCZDVNC0r8oh1QE+8S74X+hoYwocKM4iaJbKz35eIUrlu6OBUBK37GDnYlJrJcQCS +3H8huHrmqCOE/pKZKnNeqvhHTu0f/FCOTjAmvug= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id BEB62F8057F; Mon, 31 Oct 2022 16:50:08 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E65B1F80580; Mon, 31 Oct 2022 16:50:05 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id A6135F80557 for ; Mon, 31 Oct 2022 16:49:58 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A6135F80557 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="natOvrZv" 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="308929981" X-IronPort-AV: E=Sophos;i="5.95,228,1661842800"; d="scan'208";a="308929981" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.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 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 Cc: Cezary Rojewski , Vijendar.Mukunda@amd.com, heiko@sntech.de, AjitKumar.Pandey@amd.com, linux-rockchip@lists.infradead.org, tiwai@suse.com, pierre-louis.bossart@linux.intel.com, jiaxin.yu@mediatek.com, lgirdwood@gmail.com, hdegoede@redhat.com, Syed.SabaKareem@amd.com, amadeuszx.slawinski@linux.intel.com, trevor.wu@mediatek.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" 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 ");