From patchwork Sat Oct 22 07:23:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1096598wrr; Sat, 22 Oct 2022 01:05:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM791BzsD1bNVirb+HtVW/P2wTm1O3xeWmm87hoxxvxWyNC2C00bM+g8Blw+4gDkmUANdnlY X-Received: by 2002:a63:571c:0:b0:452:e934:4058 with SMTP id l28-20020a63571c000000b00452e9344058mr19333857pgb.426.1666425931089; Sat, 22 Oct 2022 01:05:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425931; cv=none; d=google.com; s=arc-20160816; b=ZyGBlPLfx/P+7LpDrdIdWP/wi+m17HeL1pHznpjgWGvDRy3YJFnGCX95pqAm6x0mer IhBG/Rgjwi/MIgVZbRpvalJbxFyI5WpgEZNlkwJL3ibyUitS6CWUEyII8Dex+s3aVSvy 7ti2lOHMaEsTUeou5/2j35hJy2k7E/ZpvXD4OT/82I9cwVvQLuMo/4SAcQOJpWbNS+KM SNAaDyFxESPY4nkzic8Yi3HgcyP+u2QQwoqBdkLzawjQ1uRATCie8a5+Y/GYo7eqRLl9 byoCP5mNBNlt1Fv/jjmk61E/ducvFYDm3qpbl3L/Z1vCnzoyPg1cfFW8azEjvlhRBPUd 9NQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m7/YXtN3h0vTT77IRVuMOK3W3RLIfPEvB1edy4Z/FSE=; b=j5gCbTib7XXUZYQGp5r1aiToNVzNUsAS6ytJbi7GpNUuptxIpNoOPjzxoP6E3kF/z+ O54MgIDzF+HyCBEPgAAiT85j9eO+EqBXUwFCZvNCtCgN+itlfvSrkSqaOC+4atGuE7bf +HW5Vcj4wSbLgSHEuxlAs2e6vdQMoBC93p0Y1sk/FwliJ4p0DIFMnPisKPHQ8UfDDW+W T8fgdSy8D5KCxdqqpCslJmUs04SxsxOlmv9thTr8RrjjY8e3yqPdio7k0dC8vBLVfO9K qEm1GTP0qpQI3XaMtwf4+99gU+rhchh9rcUgsipU5WfGCPy6ZYxhb1B2abWpdhEpPt/n 4PDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zkwAnTZu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l184-20020a6388c1000000b0046ebe02835bsi3865240pgd.283.2022.10.22.01.05.17; Sat, 22 Oct 2022 01:05:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zkwAnTZu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232847AbiJVIES (ORCPT + 99 others); Sat, 22 Oct 2022 04:04:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232354AbiJVH5t (ORCPT ); Sat, 22 Oct 2022 03:57:49 -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 416C71705D; Sat, 22 Oct 2022 00:48:40 -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 83405B82DF0; Sat, 22 Oct 2022 07:48:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F22EFC433D6; Sat, 22 Oct 2022 07:48:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424884; bh=68E9zNx4nfInYFDMqNQFvaQmUhl+e8RIQ89AnbruO/c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zkwAnTZuJe9TvYaC2dtscU+NaUVoNJBCwtaUfGjl/L8V53Eq1qS9lWFO6AyOq6fKM tqLf7g6y24bhKz4eNVmwWZ+srai8rP+TMiThCBIualKwES0I7AtQtyJ8qstnHNfDMq Z6eC+Dzj52e2VdXTgo6WVqGzlHY9PcpmHaRT+ORw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Martin_Povi=C5=A1er?= , Mark Brown , Sasha Levin Subject: [PATCH 5.19 312/717] ASoC: tas2764: Drop conflicting set_bias_level power setting Date: Sat, 22 Oct 2022 09:23:11 +0200 Message-Id: <20221022072507.624459929@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747374236899827647?= X-GMAIL-MSGID: =?utf-8?q?1747374236899827647?= From: Martin Povišer [ Upstream commit 09273f38832406db19a8907a934687cc10660a6b ] The driver is setting the PWR_CTRL field in both the set_bias_level callback and on DAPM events of the DAC widget (and also in the mute_stream method). Drop the set_bias_level callback altogether as the power setting it does is in conflict with the other code paths. (This mirrors commit c8a6ae3fe1c8 ("ASoC: tas2770: Drop conflicting set_bias_level power setting") which was a fix to the tas2770 driver.) Fixes: 827ed8a0fa50 ("ASoC: tas2764: Add the driver for the TAS2764") Signed-off-by: Martin Povišer Link: https://lore.kernel.org/r/20220825140241.53963-3-povik+lin@cutebit.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/tas2764.c | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c index 00df36fb3ede..c11406bbe5bc 100644 --- a/sound/soc/codecs/tas2764.c +++ b/sound/soc/codecs/tas2764.c @@ -50,38 +50,6 @@ static void tas2764_reset(struct tas2764_priv *tas2764) usleep_range(1000, 2000); } -static int tas2764_set_bias_level(struct snd_soc_component *component, - enum snd_soc_bias_level level) -{ - struct tas2764_priv *tas2764 = snd_soc_component_get_drvdata(component); - - switch (level) { - case SND_SOC_BIAS_ON: - snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_ACTIVE); - break; - case SND_SOC_BIAS_STANDBY: - case SND_SOC_BIAS_PREPARE: - snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_MUTE); - break; - case SND_SOC_BIAS_OFF: - snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_SHUTDOWN); - break; - - default: - dev_err(tas2764->dev, - "wrong power level setting %d\n", level); - return -EINVAL; - } - - return 0; -} - #ifdef CONFIG_PM static int tas2764_codec_suspend(struct snd_soc_component *component) { @@ -549,7 +517,6 @@ static const struct snd_soc_component_driver soc_component_driver_tas2764 = { .probe = tas2764_codec_probe, .suspend = tas2764_codec_suspend, .resume = tas2764_codec_resume, - .set_bias_level = tas2764_set_bias_level, .controls = tas2764_snd_controls, .num_controls = ARRAY_SIZE(tas2764_snd_controls), .dapm_widgets = tas2764_dapm_widgets,