From patchwork Thu Dec 23 05:13:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1572521 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=ttlHPuCr; 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 4JKJJW6chwz9t5K for ; Thu, 23 Dec 2021 16:14:03 +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 1n0GQM-0000ce-3k; Thu, 23 Dec 2021 05:13:54 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1n0GQ6-0000Bb-IO for kernel-team@lists.ubuntu.com; Thu, 23 Dec 2021 05:13:38 +0000 Received: from localhost.localdomain (unknown [103.229.218.199]) (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-1.canonical.com (Postfix) with ESMTPSA id 8569A3F177 for ; Thu, 23 Dec 2021 05:13:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1640236416; bh=MC/YSQjneW5G2RcE0P7ES1LLl9Al+e2cOdk4GybNXEA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ttlHPuCrgOixATOfMUK3A6Ikq7QR/CwXfM+52S/3WogsN9owRe4MScVHuovTpYYpH CcvZYLI2YgE6x520MRae4qYMyWsd5prf/TvBTc1Sy/fkT9sYpnShZgwNS0cGac2RYW tBfY39yfEx449OxBfmc1sPfRHs/CZjW71jZutz3qBro6u086oP/uNShtnGgV+xuw72 +fJt7/0Izu1eH76DZFEv+OeGK2hfi2/ybNv4UU9Ypm7tfkrS2nrSP96jJQEvCIDYXy NgfH8Mf5afc1KLX9+hl/YXz8GGzdqFSDRUfFjN96ZWO7/P1OUy6LDTvqA9uJrgQvcP satF9Tuw1feFQ== From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][j][PATCH v2 16/17] ASoC: intel: sof_sdw: remove get_next_be_id Date: Thu, 23 Dec 2021 13:13:06 +0800 Message-Id: <20211223051307.8485-17-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211223051307.8485-1-hui.wang@canonical.com> References: <20211223051307.8485-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 DAI link id will not be set from sdw codec init feedback function, and be_id is changed by create_sdw_dailink() now. So we don't need get_next_be_id() anymore. Signed-off-by: Bard Liao Link: https://lore.kernel.org/r/20211027021824.24776-10-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown (cherry picked from commit 4ed65d6ead29a992c4803e1138a6042caa6ec2a3) Signed-off-by: Hui Wang --- sound/soc/intel/boards/sof_sdw.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index a08bc5491b28..c1550e789513 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -1034,17 +1034,6 @@ static int create_sdw_dailink(struct snd_soc_card *card, return 0; } -/* - * DAI link ID of SSP & DMIC & HDMI are based on last - * link ID used by sdw link. Since be_id may be changed - * in init func of sdw codec, it is not equal to be_id - */ -static inline int get_next_be_id(struct snd_soc_dai_link *links, - int be_id) -{ - return links[be_id - 1].id + 1; -} - #define IDISP_CODEC_MASK 0x4 static int sof_card_codec_conf_alloc(struct device *dev, @@ -1213,9 +1202,6 @@ static int sof_card_dai_links_create(struct device *dev, } } - /* get BE ID for non-sdw DAI */ - be_id = get_next_be_id(links, link_index); - SSP: /* SSP */ if (!ssp_num)