From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1B4323E25B for ; Wed, 20 May 2026 13:11:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282698; cv=none; b=E1TYv1zON6mcZvUefVe9R8pcXraVq/LbPLtBFDIPzuaFtHZF/kQaRKJLhOGEl2pi5st0nPQ6oY1DHAcC8TKZkBzI7LDa0dqiKRNUuZqem+S4Ni/8IdR97fDXSifwgFbhWvlnbRvth6FDDKrxH+ysVL7ymGSox7HFvJM5780DMOA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779282698; c=relaxed/simple; bh=+iMlihNho3dxBuB2NxQywwYB98MlmMq1sPtWGD7AUuw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HzUkl1OsCFSZbiM3ywoV6t4oQN5rejLwMc42TBpIJUv+mMUwHx1800B/2f967um2ePxzsmQgDr715KxRYQT8H8bp2zzJgbrJyTmHHFrgkKb/osvh0upVyMm9MZEpHDZoS2//LvwOLYkvikjtusuGJti1rMSagYcUPnbA64qmRu4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=caw/8Wmg; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="caw/8Wmg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFA391F000E9; Wed, 20 May 2026 13:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779282690; bh=2jp54rzNVsONH3Xxib08YYIhOeIL10WagrvcizShgdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=caw/8Wmgyls9hAjjM094EbIvNhm8rKqYjcQrgA3WekmF5v5rp09JkhpyzT1T3lk2b 1zUmAYK+v3Y56T3EGplR6kBaKblae53p854P/S1peIn4JWHKTXG5Un0HVvKi1l7N9A B0kFB8ZyAK2sgytgwlhCEXEjHIpCUqJBcCufhW+ZCAlQfCNIR1Wv1cSAvfreg3sIGm Ep7ByDuG782SSZOpGbFXhiQ2vy0fhUnKXQZqVm+32EkNUu1s014XWPDJMH24v6zWAk UsMa5ha7H5Q/X6HlC7Z8OgSgCu6TE8ITc+qVwpU/3XXDk7E2ui40ax/wTypNYgg1FR /SJoz03DpoaFQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Pei Xiao , Mark Brown , Sasha Levin Subject: [PATCH 6.18.y 1/2] spi: sifive: Simplify clock handling with devm_clk_get_enabled() Date: Wed, 20 May 2026 09:11:27 -0400 Message-ID: <20260520131128.3608456-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051546-bulldog-wildcat-3dd3@gregkh> References: <2026051546-bulldog-wildcat-3dd3@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Pei Xiao [ Upstream commit 140039c23aca067b9ff0242e3c0ce96276bb95f3 ] Replace devm_clk_get() followed by clk_prepare_enable() with devm_clk_get_enabled() for the bus clock. This reduces boilerplate code and error handling, as the managed API automatically disables the clock when the device is removed or if probe fails. Remove the now-unnecessary clk_disable_unprepare() calls from the probe error path and the remove callback. Adjust the error handling to use the existing put_host label. Signed-off-by: Pei Xiao Link: https://patch.msgid.link/73d0d8ecb4e1af5a558d6a7866c0f886d94fe3d1.1773885292.git.xiaopei01@kylinos.cn Signed-off-by: Mark Brown Stable-dep-of: 0f25236694a2 ("spi: sifive: fix controller deregistration") Signed-off-by: Sasha Levin --- drivers/spi/spi-sifive.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-sifive.c b/drivers/spi/spi-sifive.c index 87bde2a207a3e..90be9fbab7071 100644 --- a/drivers/spi/spi-sifive.c +++ b/drivers/spi/spi-sifive.c @@ -312,7 +312,8 @@ static int sifive_spi_probe(struct platform_device *pdev) goto put_host; } - spi->clk = devm_clk_get(&pdev->dev, NULL); + /* Spin up the bus clock before hitting registers */ + spi->clk = devm_clk_get_enabled(&pdev->dev, NULL); if (IS_ERR(spi->clk)) { dev_err(&pdev->dev, "Unable to find bus clock\n"); ret = PTR_ERR(spi->clk); @@ -342,13 +343,6 @@ static int sifive_spi_probe(struct platform_device *pdev) goto put_host; } - /* Spin up the bus clock before hitting registers */ - ret = clk_prepare_enable(spi->clk); - if (ret) { - dev_err(&pdev->dev, "Unable to enable bus clock\n"); - goto put_host; - } - /* probe the number of CS lines */ spi->cs_inactive = sifive_spi_read(spi, SIFIVE_SPI_REG_CSDEF); sifive_spi_write(spi, SIFIVE_SPI_REG_CSDEF, 0xffffffffU); @@ -357,14 +351,14 @@ static int sifive_spi_probe(struct platform_device *pdev) if (!cs_bits) { dev_err(&pdev->dev, "Could not auto probe CS lines\n"); ret = -EINVAL; - goto disable_clk; + goto put_host; } num_cs = ilog2(cs_bits) + 1; if (num_cs > SIFIVE_SPI_MAX_CS) { dev_err(&pdev->dev, "Invalid number of spi targets\n"); ret = -EINVAL; - goto disable_clk; + goto put_host; } /* Define our host */ @@ -393,7 +387,7 @@ static int sifive_spi_probe(struct platform_device *pdev) dev_name(&pdev->dev), spi); if (ret) { dev_err(&pdev->dev, "Unable to bind to interrupt\n"); - goto disable_clk; + goto put_host; } dev_info(&pdev->dev, "mapped; irq=%d, cs=%d\n", @@ -402,13 +396,11 @@ static int sifive_spi_probe(struct platform_device *pdev) ret = devm_spi_register_controller(&pdev->dev, host); if (ret < 0) { dev_err(&pdev->dev, "spi_register_host failed\n"); - goto disable_clk; + goto put_host; } return 0; -disable_clk: - clk_disable_unprepare(spi->clk); put_host: spi_controller_put(host); @@ -422,7 +414,6 @@ static void sifive_spi_remove(struct platform_device *pdev) /* Disable all the interrupts just in case */ sifive_spi_write(spi, SIFIVE_SPI_REG_IE, 0); - clk_disable_unprepare(spi->clk); } static int sifive_spi_suspend(struct device *dev) -- 2.53.0