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 9E0FC3F4106 for ; Thu, 14 May 2026 03:09:58 +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=1778728198; cv=none; b=j+KBn133xydE7n3WvqAZedpTv+QbPUf0BlL6Qi/3+0zFS3RLNKlMBCVHJ2fnkNHCkz7bVL1UpX6JAiuusX+bn8eRkZ6mOnAz+whRfWnlH7KqXb356AEiZ34L5C871iDi67cA0hTjo2auc9lfZeDjym/E1qZuQvfGDAfoxXaX6oQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778728198; c=relaxed/simple; bh=7fBcM3yL8u0nVQPJl7HZZMks1sbcBZa0J3KRPFplMJU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ReDSRhFkHyLVpzNMT6iBqgJ4P+/GOuag1AYpOqIck3aPqqJrKt8B4MNvQVbgI1/5caR6B7m3JjxB4lXeUNYRmZ3c/C49w3M8s6ajGsCQJr+9fCoywhQdppwSYXKwwmdhmG+7cjEyN8u7iOyw9ig3STjpYfsJS9J3s5/ALlgdoyM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nXVW76Ny; 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="nXVW76Ny" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 903E2C19425; Thu, 14 May 2026 03:09:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778728198; bh=7fBcM3yL8u0nVQPJl7HZZMks1sbcBZa0J3KRPFplMJU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nXVW76Ny8aPfkLGbiwyjcx/dXsw/x2ID9ZJuOJkUciLddF5HKuSd/w0lZ8k72Eg0T e8zuM8WazIjKNf//5EXr86vVveDMGta3T76Z6lHlH2UYO5R8sFclu3HaKl32RyaD3d ydI80+/FluijX7f58mvmm6IsPl4HmtvdFQzx1XSUPR1ZdjIYt/M3HtP5PYDrJsnPIL e75/8Ls5OJuGhVIGDL5w9nTVqvVoxHLxq6moNYtt7Zzo6+aIDK5ic7iSfiL8bloIhn SU6EiZCNqMbwoyCze3hk9n3mVNbSKLKH077MFnDRapZgEL6XdHKPi4WGEKqlct/WLe ft1RyBs3SRDCg== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Naga Sureshkumar Relli , Mark Brown , Sasha Levin Subject: [PATCH 5.15.y] spi: zynq-qspi: fix controller deregistration Date: Wed, 13 May 2026 23:09:55 -0400 Message-ID: <20260514030955.4116823-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051204-outboard-parmesan-a293@gregkh> References: <2026051204-outboard-parmesan-a293@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 77ea6b5223483..f1c1047c949ad 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