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 A014B3B7751 for ; Wed, 13 May 2026 19:34: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=1778700866; cv=none; b=oht+HAcVkhTVxHQK+9UyKPMqpOhWHQhpO6SsQ2Vt0S8FnNJvHN+UmrUOdcNxV3kxF5xA8udeUkFjBNRGIimXI0muvbOMW4lB/XIL70ZzBeQxackS/p+txPNO2We1L+bIR8Je3ysdCoKZNk2O2LSJ/K2fRhX/YPaTlG1whuLfIpg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778700866; c=relaxed/simple; bh=mUYqLiQsPBYjytQY2NnSJuyqo5TVf6Y6ivxaLYqiTVE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ijVMm2hWuXQ9CgwsKVlAU0tzkfHS1eIa4R195sUnnh7dc6uPbeEJI1yTGhlSqcBFEAtwwZgb/5jblbhJMFJd38wrP/VM2q6oOj7EhdYLgHB1NjZPK/23S+xKhoNxK8IyPpJT/pfSur+XmpIOGGJnwAWCK7EwzO3Q1hpptid6ong= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aUWTCBJK; 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="aUWTCBJK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9561C2BCC9; Wed, 13 May 2026 19:34:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778700866; bh=mUYqLiQsPBYjytQY2NnSJuyqo5TVf6Y6ivxaLYqiTVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aUWTCBJKDrkXYZXo3/qNkynjrdAcqA/YGLL65rCxpByRNsmErIdN3+aN/R4Cw/jji WomdTyeEABax2gNmtD7gMW8vH/FoFykT9hx6zLKGrpepdK7v0r6/qFiYjwfEraY8Wm l54Xv2nNUZaJelapSpaOjWBMRZKBusEVMhSzX53ynXevbQxMAh7DKkWU10wCm+VXmN Cwlcr/mzHspq0aCHkdM2lWn6IGNVWKSvjrc5Hrn1m7guZrsh0rKuJ4OLq5no+v9ZW9 jiSxbh4cuGKt1KF84g4MPDVriH8Lw7g7IQHNz57psmL2YEKUm3vgJPgvN9PVflaLHX Ci03j7A0Pw8GQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Johan Hovold , Naga Sureshkumar Relli , Mark Brown , Sasha Levin Subject: [PATCH 6.1.y 5/5] spi: zynq-qspi: fix controller deregistration Date: Wed, 13 May 2026 15:34:20 -0400 Message-ID: <20260513193420.3938432-5-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260513193420.3938432-1-sashal@kernel.org> References: <2026051203-regain-crablike-8461@gregkh> <20260513193420.3938432-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 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 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 695ded977b911..1ba321f0e57ce 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -641,7 +641,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); @@ -699,9 +699,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, "devm_spi_register_controller failed\n"); + dev_err(&pdev->dev, "failed to register controller\n"); goto remove_ctlr; } @@ -725,9 +725,16 @@ static int zynq_qspi_probe(struct platform_device *pdev) */ static void 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); + + spi_controller_put(ctlr); } static const struct of_device_id zynq_qspi_of_match[] = { -- 2.53.0