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; }