From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5D9353AB267 for ; Thu, 14 May 2026 04:36:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778733395; cv=none; b=P2qC/e0FAWQyN4cLY0eI7B33qsTEW6TwUG1xKjzO/s1GJd66lq2xJZfwwEnmyPEMaRAnxy1FwITyvCDRKQm2LkqlB0YejiHP+XW5Vz3LqfU1Bqkrsg0Fn8NuwNsKXOBaU7Co/KVAToTitqFfna4mLcVRxsXD+Rk3Yw1X4fg5IH4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778733395; c=relaxed/simple; bh=NpjBNmhuVgxekzmBStCt7JWuadYs8hVubDKNT0fch1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KagrAdFgFkKzhko4UruDhNbCRf3WFqC6YqxFluro0UHzkBXPFUGCmgsZ98Syka+WgIjPDSpOGNmSUaRzMp7EOucfyIALp2ZD7u5mXgf5i4gCDEJQNKt9gHfCVuXnUhmvozkF3D5O7Bhyi3ILrKj35vOBVyGHsKQBULM/0PeNwPY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Gqe6bLny; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Gqe6bLny" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F504C2BCC6; Thu, 14 May 2026 04:36:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778733395; bh=NpjBNmhuVgxekzmBStCt7JWuadYs8hVubDKNT0fch1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gqe6bLnyMlqAn2W7/4lQN3pHIVSoMrL0QhUPFZ38ZEB8muAQqjy3RwF0fD2UO70NC TrnWoq0lesyYWmEpuybENHMdenZWlW+KZkZH44Y86+5lUTSH+7tB3A4ZJAxyY/Mica FhMUn6ue5A+CdPQImPc2QjjkcksgJigZv1Rof5kXzRmJjA5FXCPbrPvk7RjK6fT5UZ zi/5k+b3qVvssHOD0dEObglw/tXqN5sVn1N/vonnzyLvVEDUj707/HYmFYrRbQYbrG yr30VDNiU2CVvB2w65DTasx/rpXT72RxjNVL//8bvUP+9iSLqGfsHXyFjsPaL4FprB hfrCjIZUuVsZw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Keiji Hayashibara , Mark Brown , Sasha Levin Subject: [PATCH 7.0.y 2/2] spi: uniphier: fix controller deregistration Date: Thu, 14 May 2026 00:36:31 -0400 Message-ID: <20260514043631.10946-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260514043631.10946-1-sashal@kernel.org> References: <2026051212-foam-sharpness-9164@gregkh> <20260514043631.10946-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 0245435f777264ac45945ed2f325dd095a41d1af ] Make sure to deregister the controller before releasing underlying resources like DMA during driver unbind. Note that clocks were also disabled before the recent commit fdca270f8f87 ("spi: uniphier: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC") Cc: stable@vger.kernel.org # 4.19 Cc: Keiji Hayashibara Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-25-johan@kernel.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-uniphier.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 1b815ee2ed1b6..eac6c3e8908bd 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -746,7 +746,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) host->max_dma_len = min(dma_tx_burst, dma_rx_burst); - ret = devm_spi_register_controller(&pdev->dev, host); + ret = spi_register_controller(host); if (ret) goto out_release_dma; @@ -771,10 +771,16 @@ static void uniphier_spi_remove(struct platform_device *pdev) { struct spi_controller *host = platform_get_drvdata(pdev); + spi_controller_get(host); + + spi_unregister_controller(host); + if (host->dma_tx) dma_release_channel(host->dma_tx); if (host->dma_rx) dma_release_channel(host->dma_rx); + + spi_controller_put(host); } static const struct of_device_id uniphier_spi_match[] = { -- 2.53.0