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 762E318A6CF for ; Thu, 14 May 2026 13:06:41 +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=1778764001; cv=none; b=ZBIsR0ZiAvEL7xVMsRAQ74us+88ohvlXAHYvfcOxOe7IQI3mcmC/SjZPf4AHYRa9bQSAxwPJow7aNOcyhv2b/uvTEp4styQYcYFrx9qO9SCW0yUii7xSBuE/G6YdwFv0u+xY/nKsyXJFBpkNbHDYDvk54i6HgL//3Tiz0KJkA0c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778764001; c=relaxed/simple; bh=xvEOOnCge4olF8YpTBC28AzFrMhY9i/xAywFEIPPP0k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GC+Il13uwsERWumXxPwUU9g7Ti8JjF2E/LYV7A7c1m6Y7eTjfNP61r6yqvwiYvMXtYVbDPxBSSCevgYO9Qox90yUU46BXDU07II93OxkMqm+YKktkOy+EF/FBAA6U+aO00Vr9FhG9YnrJeTlbEkBV3RgYpOZtzBclj+QMYYcQLU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GgEC5WiW; 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="GgEC5WiW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 925FAC2BCB8; Thu, 14 May 2026 13:06:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778764001; bh=xvEOOnCge4olF8YpTBC28AzFrMhY9i/xAywFEIPPP0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GgEC5WiW3C4GmJsjC05ZUdl4MZ0ZddxvzQ/M/+xSOyioiYMPO1UuiyLFuUpFmdmX3 h5VwfdpQ28pa43indUK//qNmcQD1G8XnqYm6S6ZfFyfQXEIL9a2WQTvu13kJlsqApu Jc5VWJpmaexggN+F83CxctHmn3LLjUlrHcsgOKmZ+hWtdC1MNUF5O8B88+0jAZ4vWn 0Rp5H5ectijWXupCsN4kHF1pgKFH8rILjK3WA977u9tg/tU3f7fGKTTSL655Ze4dGW jq8n5lPjXiyicyEv1lqJBt+whMnILwd8oFbC/rgggjKJHDfYBdtKTDjwXaAi5kfDwr cTXCcZX+nqaVw== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Keiji Hayashibara , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: uniphier: fix controller deregistration Date: Thu, 14 May 2026 09:06:38 -0400 Message-ID: <20260514130638.228220-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051214-stoppable-boney-c3ce@gregkh> References: <2026051214-stoppable-boney-c3ce@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: 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 [ renamed spi_*_controller/host APIs to spi_*_master/master aliases and kept the pre-existing clk_disable_unprepare() after unregister ] 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 ad0088e394723..1b9a8d7ff091d 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -751,7 +751,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) master->max_dma_len = min(dma_tx_burst, dma_rx_burst); - ret = devm_spi_register_master(&pdev->dev, master); + ret = spi_register_master(master); if (ret) goto out_release_dma; @@ -780,6 +780,10 @@ static int uniphier_spi_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct uniphier_spi_priv *priv = spi_master_get_devdata(master); + spi_master_get(master); + + spi_unregister_master(master); + if (master->dma_tx) dma_release_channel(master->dma_tx); if (master->dma_rx) @@ -787,6 +791,8 @@ static int uniphier_spi_remove(struct platform_device *pdev) clk_disable_unprepare(priv->clk); + spi_master_put(master); + return 0; } -- 2.53.0