From patchwork Mon Jul 17 20:33:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 121594 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1336294vqt; Mon, 17 Jul 2023 13:46:57 -0700 (PDT) X-Google-Smtp-Source: APBJJlE0lLJEnV9qqmFG4OTP8WnghPInKjbvC3Bks1I3z1ymi9ssKgii8b97bAbDTPQnoHWCkwLk X-Received: by 2002:a05:6e02:1aa7:b0:348:8eb8:3ae1 with SMTP id l7-20020a056e021aa700b003488eb83ae1mr861058ilv.13.1689626816967; Mon, 17 Jul 2023 13:46:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689626816; cv=none; d=google.com; s=arc-20160816; b=GU39i0e8sye0+Kq1Yycp8r2Le+If+ooQsKNSfDBdEbmurzWi/foCFcDTkkAqG7ncSN xmtQwjwjqXAQ5K4lwY2LWcSqCZeg+4FpmCLRhqJe1mSlFwfpIWjSqkUdsIFowzvI4L6R 79w2YJrK9OA+pxI3t3Jo3/Isk2qctQBWjcKpFMBnB+knPBi7VybNfWG/3y6vbgJuLq0J IdUzCmAJWvW0U8eobfY6Kncr8zn18Zj9or6lO1kIJVTSUbo6lYywyGKgg+w9jsDf5KiN +IHJGjZe5I8rDf079TB4jtNOpFlXaasA6HMjF+5EQODj5KWpqLxfyDKrwDMtpM5bfXCz t/ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=ee8Ku8MX72Tm9J/NEm0GOURoZ9bKLLw0DBw9D2wUaf4=; fh=McUMXeUuhXkaH27wfiHa8kg8t6UxwDdzZ1NoGqLVlME=; b=XQj7B8++a+/JAEwFS7rVnXiiy6aMozDmDymNuYcZ8A8cVhHhFcytUt7VyOj2YsFXFl wG4xaINRAmv3kpZoKuA6z0+VgfYR44TV7e+c6lk1++/A17xAXLd456zfI0Pjg7a5Ki3P JY+CMvr8OPmIGxCWwUeE2QzYzpDJ0NjJkHkEvl8qZ1pOgdr44Rje6Cfobc+s8m3bywBF 2FArmcXprgfSSukMYH8ad8bo2Zyc0/2V8tjx/tCanECWk427aeuUKRorF9h0QY2mPfF1 d/1pEBvLIwXW+unFTh33CroVW8bTQnkZmw/Cak9E2MCGoOVENc2Q7L/VIZbU0KU9UXNW RfIw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=gLZUVojg; 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=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lj14-20020a17090b344e00b00263e4949dbbsi419175pjb.29.2023.07.17.13.46.42; Mon, 17 Jul 2023 13:46:56 -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=@kernel.org header.s=k20201202 header.b=gLZUVojg; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230491AbjGQUd1 (ORCPT + 99 others); Mon, 17 Jul 2023 16:33:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34126 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230447AbjGQUdV (ORCPT ); Mon, 17 Jul 2023 16:33:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 143081A8 for ; Mon, 17 Jul 2023 13:33:20 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 975DA61254 for ; Mon, 17 Jul 2023 20:33:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B94ECC433C8; Mon, 17 Jul 2023 20:33:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689625999; bh=cdhA/uWMGFYNLiuZXNgnxDS/KR9lMC2udWWSbRYPndE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gLZUVojg4jKy4PTMuuRaJRkPy+KTOrIc2UqPsvLIftUTjRU0kvMiaTuoTgweG9Bht gDFKrXKBxBCs+bnehoD3lhqDPcmEDlSGL6Idg9YliOGb435aFLHWn5PHm8/uCb3Kpm LDaOJU5IrN8F5ERCzO4kozWw4HWr+CTKw9cPrimuqScteGzPG3tEnRkSJ+YGKLXLYF 8oV/pREqjmFcItdEBJncwBwbGTV6R7uYNsU0Mkp+/0bZfzDp9mXJptYkw//OTqgE0E RNPM3BrwctvGv3QNMKYhdq3dEbQCBp8UIOVb909e4fIhvossYCCIUNYtbLks91BjZ1 MGv+Am4MHzkGw== From: Mark Brown Date: Mon, 17 Jul 2023 21:33:05 +0100 Subject: [PATCH 3/3] ALSA: hda: Use regcache_reg_cached() rather than open coding MIME-Version: 1.0 Message-Id: <20230717-regmap-cache-check-v1-3-73ef688afae3@kernel.org> References: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> In-Reply-To: <20230717-regmap-cache-check-v1-0-73ef688afae3@kernel.org> To: Jaroslav Kysela , Takashi Iwai Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1479; i=broonie@kernel.org; h=from:subject:message-id; bh=cdhA/uWMGFYNLiuZXNgnxDS/KR9lMC2udWWSbRYPndE=; b=owEBbQGS/pANAwAKASTWi3JdVIfQAcsmYgBktaWHp8xs+otXp3Fz83pPngNJL1ch5h3eptyOK 9g68ULu8WKJATMEAAEKAB0WIQSt5miqZ1cYtZ/in+ok1otyXVSH0AUCZLWlhwAKCRAk1otyXVSH 0FCcB/4/yqh/MT+mdIfR75L/u63k+FCJNO88xJeft85zjt58cF6oIUCQASp6BHpO+VK0Mqo+gaj vG2O+pbUy5tqfb6sVSbE3smMne18FuwqkldckIQsIxAQsJmjZgroJDCXgjiFqmIpfURfXQE021y kBTCvDuGa4jfVy7zC5w8JYa6TabufjXiuWOZ04u9a+8ngQjVvPbJFxFEG3OMKpGdOx/mHIhyFj/ OjMt+3AN1u3TX69YaRBa+908Tpc7x20j2RZro3hA/wiZ8Ogw2Xj1C//ABatTJx3oh57QxhcfXqC oMyVfCXaeM3x8HbZiNxXDtBC/mob9h9QTvXJLImqCDortOj+ X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771702128755027110 X-GMAIL-MSGID: 1771702128755027110 The HDA driver intentionally drops repeated writes to registers in some circumstances, beyond the suppression of noop writes that regmap does in regmap_update_bits(). It does this by checking if the register is cached before doing a regmap_update_bits(), now we have an API for querying this directly use it directly rather than trying a read in cache only mode making the code a little clearer. Signed-off-by: Mark Brown --- sound/hda/hdac_regmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c index 9b1bcabd8414..97cee096a286 100644 --- a/sound/hda/hdac_regmap.c +++ b/sound/hda/hdac_regmap.c @@ -556,17 +556,14 @@ EXPORT_SYMBOL_GPL(snd_hdac_regmap_update_raw); static int reg_raw_update_once(struct hdac_device *codec, unsigned int reg, unsigned int mask, unsigned int val) { - unsigned int orig; - int err; + int err = 0; if (!codec->regmap) return reg_raw_update(codec, reg, mask, val); mutex_lock(&codec->regmap_lock); - regcache_cache_only(codec->regmap, true); - err = regmap_read(codec->regmap, reg, &orig); - regcache_cache_only(codec->regmap, false); - if (err < 0) + /* Discard any updates to already initialised registers. */ + if (!regcache_reg_cached(codec->regmap, reg)) err = regmap_update_bits(codec->regmap, reg, mask, val); mutex_unlock(&codec->regmap_lock); return err;