From patchwork Wed Jan 5 08:13:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1575526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=PtM8W6gU; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JTMhP3yhBz9sRR for ; Wed, 5 Jan 2022 19:14:13 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1n51Qr-0003NO-SQ; Wed, 05 Jan 2022 08:14:05 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n51Qc-0002hs-5V for kernel-team@lists.ubuntu.com; Wed, 05 Jan 2022 08:13:50 +0000 Received: from localhost.localdomain (unknown [123.112.64.101]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 36D5040004 for ; Wed, 5 Jan 2022 08:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1641370429; bh=L/QNlH/X5fk83tklAG1afSZaGcYB+N1wrIO8eYppn0s=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=PtM8W6gUL9I/GHD0tMq4y4nk6JHGHqDFDpofjzdzS11RIxMcTMwL0j0iwClrVkTTJ Ug0KPRhE4zdxOwcZ0OktuhgL3e5DMSkSJJENlIhQbvtk5o4lnDvByy+YxwVM+LT5zf a9mPc5IQHxdpiBv0CzKRMObIxkqYa7SWc7xInFQOz9EeeZDAgaTETAYIXsY8P72mEp snSA42K2GXBD8t0XsiGux1USjQCxRctcnlsuSMsr4gH6fn+0ChUF0G1/3yrTIIE5UU SZ3nw7jUnyTGpB+ILPwRONmtXMoNtgD/KcL+1zKpJRNyZnuiL2TERiZdgKGo2HqvD5 iwvxMaTQIi0Vw== From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][j][PATCH v3 15/17] ASoC: intel: sof_sdw: remove sof_sdw_mic_codec_mockup_init Date: Wed, 5 Jan 2022 16:13:11 +0800 Message-Id: <20220105081313.17903-16-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220105081313.17903-1-hui.wang@canonical.com> References: <20220105081313.17903-1-hui.wang@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Bard Liao BugLink: https://bugs.launchpad.net/bugs/1951563 Now, we set DAI link id as SDW_DMIC_DAI_ID for all DMICs. No need to set it in sof_sdw_mic_codec_mockup_init. Signed-off-by: Bard Liao Link: https://lore.kernel.org/r/20211027021824.24776-9-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown (cherry picked from commit bd98394a811c7dc39bcd189cf5f33925f0c30ae2 linux-next) Signed-off-by: Hui Wang --- sound/soc/intel/boards/sof_sdw.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index f691b532332d..a08bc5491b28 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -419,20 +419,6 @@ static const struct snd_soc_ops sdw_ops = { .shutdown = sdw_shutdown, }; -static int sof_sdw_mic_codec_mockup_init(struct snd_soc_card *card, - const struct snd_soc_acpi_link_adr *link, - struct snd_soc_dai_link *dai_links, - struct sof_sdw_codec_info *info, - bool playback) -{ - /* - * force DAI link to use same ID as RT715 and DMIC - * to reuse topologies - */ - dai_links->id = SDW_DMIC_DAI_ID; - return 0; -} - static struct sof_sdw_codec_info codec_info_list[] = { { .part_id = 0x700, @@ -555,7 +541,6 @@ static struct sof_sdw_codec_info codec_info_list[] = { .version_id = 0, .direction = {false, true}, .dai_name = "sdw-mockup-aif1", - .init = sof_sdw_mic_codec_mockup_init, .codec_type = SOF_SDW_CODEC_TYPE_MIC, }, };