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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5C20C43217 for ; Mon, 30 May 2022 14:51:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242233AbiE3Ov0 (ORCPT ); Mon, 30 May 2022 10:51:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56162 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242600AbiE3ObV (ORCPT ); Mon, 30 May 2022 10:31:21 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02CDE12D1E7; Mon, 30 May 2022 06:53:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8BC86B80D6B; Mon, 30 May 2022 13:52:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 67A44C3411A; Mon, 30 May 2022 13:52:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918767; bh=8Ic3YfIspf4SZu0wJZZZYDsTRyDu74+FGba6hXMd06o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UyyBvc0ptK8QLKyVC6+wzbgsJ/476g3AKw/OSjyRweURMvw0R4RPwspxmixcV5miS xMRNfRZUgWjZmYv+Ybe5jl7mAbz0jpccNqJZ7XAr1SLUnd/2T+bJvJ9mVKtB4UQBzc hl/+bRVfzbEPYOUTdaoWog9KMackKXXOfna7bwuf3qyn3qPa0dGoq71jauLdSa9nMb +6XLMijwdi9aN+a7FenaQfVlfSlQ+MmZkCWa+/+wTe9UeXP04OkbfNe8LHhcFK37R2 2RVnh4JLTUZfN2+6dY3Dej7Jxq3wkMs8S2cnbDvG3eklyBqpZiMFidykQEE3j4UbCg dTE3s4BUQw5Eg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Brown , Sasha Levin , lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.9 14/24] ASoC: dapm: Don't fold register value changes into notifications Date: Mon, 30 May 2022 09:52:01 -0400 Message-Id: <20220530135211.1937674-14-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530135211.1937674-1-sashal@kernel.org> References: <20220530135211.1937674-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Brown [ Upstream commit ad685980469b9f9b99d4d6ea05f4cb8f57cb2234 ] DAPM tracks and reports the value presented to the user from DAPM controls separately to the register value, these may diverge during initialisation or when an autodisable control is in use. When writing DAPM controls we currently report that a change has occurred if either the DAPM value or the value stored in the register has changed, meaning that if the two are out of sync we may appear to report a spurious event to userspace. Since we use this folded in value for nothing other than the value reported to userspace simply drop the folding in of the register change. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220428161833.3690050-1-broonie@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-dapm.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 878a4fc97f04..40bf50cd87bc 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -3165,7 +3165,6 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol, update.val = val; card->update = &update; } - change |= reg_change; ret = soc_dapm_mixer_update_power(card, kcontrol, connect); @@ -3270,7 +3269,6 @@ int snd_soc_dapm_put_enum_double(struct snd_kcontrol *kcontrol, update.val = val; card->update = &update; } - change |= reg_change; ret = soc_dapm_mux_update_power(card, kcontrol, item[0], e); -- 2.35.1