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 22AB422068D for ; Thu, 14 May 2026 12:41:26 +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=1778762487; cv=none; b=K5ijV5shnvkrjl6XvJyM4CsJHFz0pwql3iLc9FApqWdEJmpXnHpuXfbGNJONhPT0LVESZhp+c/cQ9Ou5vGIRVhnW/H10X+Qo8yJJuD8rYesFtzT43nJRgOXmAM7nMfklAT/3vDXKeGKQtiL1OCYKbuCudy9zG74JVEve8HIt7Uw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778762487; c=relaxed/simple; bh=8XLfVOyCfJGPtpoL8jKbGTOHeW9v9rT94B4kspV4F4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pgajoT46K0+X+Zd4JF6/xaGckahKoBctEKlBJOCbdGcq4pJudtQZU80RW9BAHL0UdBG0dZfjetEnXpjg7IqBY8EMi16/J8602W2noiXaCV7TSSvNgwLO35gDklQH3ZzgfII3kEhG4r+j0NhOK6PhGh4ZCIf2IJcXE5fCYtST7oI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ceqZS9cE; 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="ceqZS9cE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 328B0C2BCB3; Thu, 14 May 2026 12:41:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778762486; bh=8XLfVOyCfJGPtpoL8jKbGTOHeW9v9rT94B4kspV4F4A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ceqZS9cEo53h/pXEb4vaEFXWqyCdcBKbncUFr9OmEWUhLydvOnC6ayEQZztJDBij6 YcTTLfHDuUW+Ax1a6M49e4knB19wWHD7MZ8WEa6Je/U8+xRe+BiBu1GKMLy9udZSr9 gwQwio5ECZBQ95wHiU1VjIdmIBpG8vDqYe2c7OprBBF2J0skKqdJVON9fcnpdelLL6 gZGlorf0jeWJc2MuFmFeAQqvfQ0wgj5TgyH8kvlgeviUSI6IRGjm/G6fC4j/UbNVyp CJOmIpJ8F9YXuw0DKpz8PyCvV5Z6nX22dTWBoTrISLkjg3qONS0sQuEBDlHZsldCyH ki66btlR6wJkQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Keiji Hayashibara , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y] spi: uniphier: fix controller deregistration Date: Thu, 14 May 2026 08:41:24 -0400 Message-ID: <20260514124124.212147-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051214-aching-old-35ed@gregkh> References: <2026051214-aching-old-35ed@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 cc0da48222311..05f43d67d6243 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