From patchwork Sat Sep 2 21:06:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cristian Ciocaltea X-Patchwork-Id: 13373155 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 alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 62E82C001DB for ; Sat, 2 Sep 2023 21:09:29 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id DB33EA4D; Sat, 2 Sep 2023 23:08:36 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz DB33EA4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1693688967; bh=ZFbrDlGsG1v2EjUCV6bCyGa1RigZq4UWK6ZhGbIVmVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=bnRXkYqUBgbkAoR2TOaeaapgyuyKdgktiA6saTpJjTbjZNAkf+mwIyGj5isrZ0MdH YJvhVdK4BrPbpWL2dDGsELuK/hrjmyRFyOQr7x4tX34NVQa3UYwjbMsCX1TNMBipmb Iw9iacjozBKhpW5RRmmXwLpqI1TbvhDKkOCE6ymE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 33EEEF8057F; Sat, 2 Sep 2023 23:08:06 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 6BAEBF80579; Sat, 2 Sep 2023 23:08:05 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 9A9FAF80527; Sat, 2 Sep 2023 23:06:47 +0200 (CEST) Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9D547F8025F for ; Sat, 2 Sep 2023 23:06:41 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9D547F8025F Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=VOU3U94m Received: from localhost (unknown [81.18.92.207]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: cristicc) by madras.collabora.co.uk (Postfix) with ESMTPSA id DF10866072B5; Sat, 2 Sep 2023 22:06:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1693688801; bh=ZFbrDlGsG1v2EjUCV6bCyGa1RigZq4UWK6ZhGbIVmVI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VOU3U94md0KKyLr5WS0958ZrkDv99MLMNEw9B/4NusRC+u6XlZoqvf09dEyMVKyiE 77lY+xH6013b5Hy0fgcscC8DnauGlw5D4yIgIuY/HHH3h4sCg8aqJjQlGPaaB0A8tK 7WVPWkQAipbRYOrVBzm8xrVkg8iJIqjrI7HevXUwEaYrzfWtysorJgCSvnsV9TnjfV Tv9hif395vEJy9k3OsPHVA/WeTfj1m6ejgxu21PjInTPFPqcq38p4TDaZEo23ke2fO VmA6hxKSEXmy012ZqepADt3dbECOC0s9AMD/T/jmOUD0EiLC/CtohvPcFJG9YkWzyn dvhvGRrIoTgng== From: Cristian Ciocaltea To: James Schulman , David Rhodes , Richard Fitzgerald , Jaroslav Kysela , Takashi Iwai , Liam Girdwood , Mark Brown , Stefan Binding , Charles Keepax Cc: alsa-devel@alsa-project.org, patches@opensource.cirrus.com, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH 5/9] ASoC: cs35l41: Rename pll_lock to pll_lock_done Date: Sun, 3 Sep 2023 00:06:17 +0300 Message-ID: <20230902210621.1184693-6-cristian.ciocaltea@collabora.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902210621.1184693-1-cristian.ciocaltea@collabora.com> References: <20230902210621.1184693-1-cristian.ciocaltea@collabora.com> MIME-Version: 1.0 Message-ID-Hash: IB3GNXI4CKFYVGVNHWBMZN4UHYEB5YWV X-Message-ID-Hash: IB3GNXI4CKFYVGVNHWBMZN4UHYEB5YWV X-MailFrom: cristian.ciocaltea@collabora.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Use a more intuitive name for 'pll_lock' completion, which helps improving code readability a bit. Signed-off-by: Cristian Ciocaltea Acked-by: Charles Keepax --- sound/soc/codecs/cs35l41.c | 8 ++++---- sound/soc/codecs/cs35l41.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sound/soc/codecs/cs35l41.c b/sound/soc/codecs/cs35l41.c index 9bf70da03972..e143b0e306b1 100644 --- a/sound/soc/codecs/cs35l41.c +++ b/sound/soc/codecs/cs35l41.c @@ -459,7 +459,7 @@ static irqreturn_t cs35l41_irq(int irq, void *data) if (status[2] & CS35L41_PLL_LOCK) { regmap_write(cs35l41->regmap, CS35L41_IRQ1_STATUS3, CS35L41_PLL_LOCK); - complete(&cs35l41->pll_lock); + complete(&cs35l41->pll_lock_done); ret = IRQ_HANDLED; } @@ -804,7 +804,7 @@ static int cs35l41_pcm_startup(struct snd_pcm_substream *substream, { struct cs35l41_private *cs35l41 = snd_soc_component_get_drvdata(dai->component); - reinit_completion(&cs35l41->pll_lock); + reinit_completion(&cs35l41->pll_lock_done); if (substream->runtime) return snd_pcm_hw_constraint_list(substream->runtime, 0, @@ -1160,7 +1160,7 @@ static void cs35l41_mdsync_up_work(struct work_struct *work) struct cs35l41_private *cs35l41 = container_of(work, struct cs35l41_private, mdsync_up_work); - int ret = wait_for_completion_timeout(&cs35l41->pll_lock, + int ret = wait_for_completion_timeout(&cs35l41->pll_lock_done, msecs_to_jiffies(100)); if (ret == 0) { dev_err(cs35l41->dev, "Timed out waiting for pll_lock signal\n"); @@ -1303,7 +1303,7 @@ int cs35l41_probe(struct cs35l41_private *cs35l41, const struct cs35l41_hw_cfg * regmap_update_bits(cs35l41->regmap, CS35L41_IRQ1_MASK3, CS35L41_INT3_PLL_LOCK_MASK, 0 << CS35L41_INT3_PLL_LOCK_SHIFT); - init_completion(&cs35l41->pll_lock); + init_completion(&cs35l41->pll_lock_done); ret = devm_request_threaded_irq(cs35l41->dev, cs35l41->irq, NULL, cs35l41_irq, IRQF_ONESHOT | IRQF_SHARED | irq_pol, diff --git a/sound/soc/codecs/cs35l41.h b/sound/soc/codecs/cs35l41.h index f9f85796a13a..fe61c11404e7 100644 --- a/sound/soc/codecs/cs35l41.h +++ b/sound/soc/codecs/cs35l41.h @@ -34,7 +34,7 @@ struct cs35l41_private { int irq; /* GPIO for /RST */ struct gpio_desc *reset_gpio; - struct completion pll_lock; + struct completion pll_lock_done; struct work_struct mdsync_up_work; };