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 C91AC3AB267 for ; Thu, 14 May 2026 04:14:21 +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=1778732061; cv=none; b=dSvkRkSHw4z4/5bSLtP1TedIBHNGssw8LySepsxo1CboQXjH/LZzwKGbVAyMUZhplYuWBES9zwSxwNjLOKi899HbUruugvA09nuhOosWlI5rkPOaqKFAQ21RK1rOzNED+1hBo07ADamNzcPYRMNsX4xan9YMAL/Iu/7tVoBAQeQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778732061; c=relaxed/simple; bh=pk2/h3h1WYGJC2aPvAy3eq3RltJfqxltKuPJjuh1uW8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LMRNVidC8l0+fKHNid2FkeN7wvz/sVUxHknHeD3MYYaBpeVHkTtqEjT41nlKIz9JTnyC4/Mk3mI47pfY2gZzdV7PMy6+Rz37P/X9hBd/j7sVQ/ReidhYNVNWK5ufyGVjE2858ELnJcsMCkdZwEiU764lRnfFMuOrlBHvhCq6VMc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R1eNIccU; 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="R1eNIccU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C713EC2BCB7; Thu, 14 May 2026 04:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778732061; bh=pk2/h3h1WYGJC2aPvAy3eq3RltJfqxltKuPJjuh1uW8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R1eNIccU7XYGMddqWFbPaaodowdHSt5E7JnCZRmvfzv1MY6W/ZahZyerP7FmitkVZ 9EvycRT16eVEZIeDgZL84rbIp720CLay8Rehpr2fBPz7zYE15NuGi70JyIkHYGMHyA JUcZLIWEXPGuTSwgF4jXKkQn5xwWtDc5M9/LmPtLQ3CGNiZ88DDP/yvv4+dJZX/Fb/ a8Ofx+gsxUaOfNXGBYfGMcUW3qcCEFo3l+cfxkHmqKeLVAHHClQ1EnrX2sVhve219S Jx5iD174Msyc4kWZImPcVNGPglK1/AXIIIfozS4CIhqCxIjMnpNLznj1MNnYrzlCVO 73E7QmQ/wbS3w== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Naga Sureshkumar Relli , Mark Brown , Sasha Levin Subject: [PATCH 5.10.y] spi: zynq-qspi: fix controller deregistration Date: Thu, 14 May 2026 00:14:18 -0400 Message-ID: <20260514041418.4189826-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051204-hacksaw-unopposed-238a@gregkh> References: <2026051204-hacksaw-unopposed-238a@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 c9c012706c9fa8ca6d129a9161caf92ab625a3fd ] Make sure to deregister the controller before disabling it during driver unbind. Note that clocks were also disabled before the recent commit 1f8fd9490e31 ("spi: zynq-qspi: Simplify clock handling with devm_clk_get_enabled()"). Fixes: 67dca5e580f1 ("spi: spi-mem: Add support for Zynq QSPI controller") Cc: stable@vger.kernel.org # 5.2: 8eb2fd00f65a Cc: stable@vger.kernel.org # 5.2 Cc: Naga Sureshkumar Relli Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20260410081757.503099-27-johan@kernel.org Signed-off-by: Mark Brown [ kept int-returning remove() with manual clk_disable_unprepare() calls and routed probe error through existing clk_dis_all cascade instead of upstream's remove_ctlr label ] Signed-off-by: Sasha Levin --- drivers/spi/spi-zynq-qspi.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c index 2be764d5460d3..99d0ad2ecadde 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -652,7 +652,7 @@ static int zynq_qspi_probe(struct platform_device *pdev) xqspi = spi_controller_get_devdata(ctlr); xqspi->dev = dev; - platform_set_drvdata(pdev, xqspi); + platform_set_drvdata(pdev, ctlr); xqspi->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(xqspi->regs)) { ret = PTR_ERR(xqspi->regs); @@ -722,9 +722,9 @@ static int zynq_qspi_probe(struct platform_device *pdev) /* QSPI controller initializations */ zynq_qspi_init_hw(xqspi, ctlr->num_chipselect); - ret = devm_spi_register_controller(&pdev->dev, ctlr); + ret = spi_register_controller(ctlr); if (ret) { - dev_err(&pdev->dev, "spi_register_master failed\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto clk_dis_all; } @@ -752,13 +752,20 @@ static int zynq_qspi_probe(struct platform_device *pdev) */ static int zynq_qspi_remove(struct platform_device *pdev) { - struct zynq_qspi *xqspi = platform_get_drvdata(pdev); + struct spi_controller *ctlr = platform_get_drvdata(pdev); + struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr); + + spi_controller_get(ctlr); + + spi_unregister_controller(ctlr); zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0); clk_disable_unprepare(xqspi->refclk); clk_disable_unprepare(xqspi->pclk); + spi_controller_put(ctlr); + return 0; } -- 2.53.0