From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D386C433FE for ; Tue, 16 Nov 2021 01:22:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B44861BE2 for ; Tue, 16 Nov 2021 01:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356410AbhKPBXc (ORCPT ); Mon, 15 Nov 2021 20:23:32 -0500 Received: from mail.kernel.org ([198.145.29.99]:42964 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244386AbhKOTOC (ORCPT ); Mon, 15 Nov 2021 14:14:02 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8BA29634B8; Mon, 15 Nov 2021 18:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637000426; bh=Kb315VE26z33mFaA9+Vy/v4kc7EakvMWO1nTpfHe6EI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MSNuqknolz87A1g6CE/AzHXPqa9IVdFEd7zXiqjbcXjVx/dyi9uW8X8MrVeOP+q4z xGqal6xKnqGsD4i2+8HTtmYkG1Bp1amUSTRosoTwH70zKcWKgPM+SXuPFY9Gt7Te9z ThOqBAFPAXWvEkAwO+frKE+ltyAN3pScdc8zGL4o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Sasha Levin Subject: [PATCH 5.14 638/849] ASoC: topology: Fix stub for snd_soc_tplg_component_remove() Date: Mon, 15 Nov 2021 18:02:01 +0100 Message-Id: <20211115165441.854898481@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165419.961798833@linuxfoundation.org> References: <20211115165419.961798833@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit 1198ff12cbdd5f42c032cba1d96ebc7af8024cf9 ] When removing the index argument from snd_soc_topology_component_remove() commit a5b8f71c5477f (ASoC: topology: Remove multistep topology loading) forgot to update the stub for !SND_SOC_TOPOLOGY use, causing build failures for anything that tries to make use of it. Fixes: a5b8f71c5477f (ASoC: topology: Remove multistep topology loading) Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20211025154844.2342120-1-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- include/sound/soc-topology.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index 4afd667e124c2..3e8a85e1e8094 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -188,8 +188,7 @@ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w, #else -static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp, - u32 index) +static inline int snd_soc_tplg_component_remove(struct snd_soc_component *comp) { return 0; } -- 2.33.0