From patchwork Thu May 25 13:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Binding X-Patchwork-Id: 99037 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp391553vqr; Thu, 25 May 2023 07:01:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ57BQPzE9e4WEHr1e3zEMGFEmwOZ2M4gSROpFyy1w+HvgwYffJzmW9EDx1m1VCqNspqf36G X-Received: by 2002:a05:6a00:180d:b0:64e:bada:2411 with SMTP id y13-20020a056a00180d00b0064ebada2411mr9384746pfa.25.1685023295947; Thu, 25 May 2023 07:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685023295; cv=none; d=google.com; s=arc-20160816; b=NUvwmaymkaH1y+FTY9ALiRYciqRutOz9Z4kGBMR+5mclhEn8AbBHqhGkEIC3ZEC/PO 6guuNhh2YfVTcR7hdmx5zuBDvfC1gpAVWU0AXLHpaBbzV/YbpdH0vTMe8YFO/6fe5cgG yJuEgrQTYITtwp9P+Qs+2tr5jC83ur+kDPWvuxO320LVhPkxqCfQ0iZjMRkTVCuH08l/ gFfkbQH3VztfswRxXdIzdQBQWeb6sUcAu8v/L3Kza2q+LAj04E+kmtOH6WnxNNQw1hF4 YrTXY9Q3PyP1bY2rYEDGrI2tDkt1B9A8F3QxNTLSsnfkSzKEvzfdi7W0K44wI18SglQB 7TAw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=I3l9dEf9Pxrt0iwsB+1r4Bv1ieTEMmtO3O+2uHhuyLc=; b=eX2g6a9DcvWjqbqUIu1y4A8mL87QnjAvqznRO+wT40mxjTNZYuPwXRK+UcMXaiSq+5 XG/pXTzELTnWC8XEFQggiZQwPjsPJNPoqD1M5+mB6LF37/EdB4bGOgjHi4x6HsbC2yFM sccch4YZv0Y0QO2zDPx2Pz8Wdv5KH495X0/yhaYvxg5QzaWpbyAWGWUKcBEZM1taqid2 56cX1GU+2VT7d/j6D+CkkLydab+1YHpxC0BTC14vqMQVZ2vUhpSB+Um93CDDRgcPmdUm XvLF07aKjkLIJtgMOp+kooQK8N4IeyeBb4LQykHmttTithhyR8r63+D62kA1msJ106JT Zwug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=LjovRqGn; 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=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f4-20020aa79d84000000b006435149f9ccsi1599692pfq.63.2023.05.25.07.01.21; Thu, 25 May 2023 07:01:35 -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=@cirrus.com header.s=PODMain02222019 header.b=LjovRqGn; 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=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232311AbjEYOAd (ORCPT + 99 others); Thu, 25 May 2023 10:00:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241197AbjEYOA3 (ORCPT ); Thu, 25 May 2023 10:00:29 -0400 Received: from mx0b-001ae601.pphosted.com (mx0b-001ae601.pphosted.com [67.231.152.168]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC6FDE49 for ; Thu, 25 May 2023 07:00:19 -0700 (PDT) Received: from pps.filterd (m0077474.ppops.net [127.0.0.1]) by mx0b-001ae601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 34PBPhU2006105; Thu, 25 May 2023 09:00:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=PODMain02222019; bh=I3l9dEf9Pxrt0iwsB+1r4Bv1ieTEMmtO3O+2uHhuyLc=; b=LjovRqGnqJBLgMnsb+RmNOQD7sbuLvL4avbkpPfOwJbdERZBaGjUvGtiuPgtqZ5t6KKm d1eH3bbHQloTje/fWpecbdxj+j2mD8PR+0A/nH8K769/KosJ7ggQHkInoptc7X72OQO8 Uwn/rCh54gQhiim3/i5EHxYBpJwgrlwU4Ep57jPssb7bG8/SsG2mqoRczVbyJtgND40n TR99g+ARvkSgw3BZgFUA0/DCOPovexzFmvsKOcq3hpGXbFbDQHkGHxtZDdaNh+5V6JEb 9utSVcSszXSf2Qo0jKOsWJLRfkQel16f30PTGbEBmjop/0PEM8wdDSKSwFIe7Qe2XCE9 nQ== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0b-001ae601.pphosted.com (PPS) with ESMTPS id 3qptmm6wbf-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 May 2023 09:00:05 -0500 Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Thu, 25 May 2023 09:00:03 -0500 Received: from ediswmail.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Thu, 25 May 2023 09:00:03 -0500 Received: from sbinding-cirrus-dsktp2.ad.cirrus.com (unknown [198.90.238.43]) by ediswmail.ad.cirrus.com (Postfix) with ESMTP id 2591945; Thu, 25 May 2023 14:00:03 +0000 (UTC) From: Stefan Binding To: Jaroslav Kysela , Takashi Iwai CC: , , , Stefan Binding Subject: [PATCH RESEND v1 1/3] ALSA: hda: cs35l41: Clean up Firmware Load Controls Date: Thu, 25 May 2023 14:59:53 +0100 Message-ID: <20230525135955.2108140-2-sbinding@opensource.cirrus.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230525135955.2108140-1-sbinding@opensource.cirrus.com> References: <20230525135955.2108140-1-sbinding@opensource.cirrus.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: SDkSKi_mbC0gP72s9JAp318146wTbO-a X-Proofpoint-GUID: SDkSKi_mbC0gP72s9JAp318146wTbO-a X-Proofpoint-Spam-Reason: safe X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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?1766874987611415437?= X-GMAIL-MSGID: =?utf-8?q?1766874987611415437?= Ensure Firmware Load control and Firmware Type control returns 1 when the value changes. Remove fw_mutex from firmware load control put, since it is unnecessary, and prevents any possibility of mutex inversion. Signed-off-by: Stefan Binding --- sound/pci/hda/cs35l41_hda.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index b5210abb5141f..d100189e15b83 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -835,34 +835,26 @@ static int cs35l41_fw_load_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol); - unsigned int ret = 0; - - mutex_lock(&cs35l41->fw_mutex); if (cs35l41->request_fw_load == ucontrol->value.integer.value[0]) - goto err; + return 0; if (cs35l41->fw_request_ongoing) { dev_dbg(cs35l41->dev, "Existing request not complete\n"); - ret = -EBUSY; - goto err; + return -EBUSY; } /* Check if playback is ongoing when initial request is made */ if (cs35l41->playback_started) { dev_err(cs35l41->dev, "Cannot Load/Unload firmware during Playback\n"); - ret = -EBUSY; - goto err; + return -EBUSY; } cs35l41->fw_request_ongoing = true; cs35l41->request_fw_load = ucontrol->value.integer.value[0]; schedule_work(&cs35l41->fw_load_work); -err: - mutex_unlock(&cs35l41->fw_mutex); - - return ret; + return 1; } static int cs35l41_fw_type_ctl_get(struct snd_kcontrol *kcontrol, @@ -881,8 +873,12 @@ static int cs35l41_fw_type_ctl_put(struct snd_kcontrol *kcontrol, struct cs35l41_hda *cs35l41 = snd_kcontrol_chip(kcontrol); if (ucontrol->value.enumerated.item[0] < HDA_CS_DSP_NUM_FW) { - cs35l41->firmware_type = ucontrol->value.enumerated.item[0]; - return 0; + if (cs35l41->firmware_type != ucontrol->value.enumerated.item[0]) { + cs35l41->firmware_type = ucontrol->value.enumerated.item[0]; + return 1; + } else { + return 0; + } } return -EINVAL;