tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

spi: zynq-qspi: fix controller deregistration

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 <naga.sureshkumar.relli@xilinx.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260410081757.503099-27-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Johan Hovold and committed by
Mark Brown c9c01270 6895fc4f

+11 -4
+11 -4
drivers/spi/spi-zynq-qspi.c
··· 643 643 644 644 xqspi = spi_controller_get_devdata(ctlr); 645 645 xqspi->dev = dev; 646 - platform_set_drvdata(pdev, xqspi); 646 + platform_set_drvdata(pdev, ctlr); 647 647 xqspi->regs = devm_platform_ioremap_resource(pdev, 0); 648 648 if (IS_ERR(xqspi->regs)) { 649 649 ret = PTR_ERR(xqspi->regs); ··· 702 702 /* QSPI controller initializations */ 703 703 zynq_qspi_init_hw(xqspi, ctlr->num_chipselect); 704 704 705 - ret = devm_spi_register_controller(&pdev->dev, ctlr); 705 + ret = spi_register_controller(ctlr); 706 706 if (ret) { 707 - dev_err(&pdev->dev, "devm_spi_register_controller failed\n"); 707 + dev_err(&pdev->dev, "failed to register controller\n"); 708 708 goto remove_ctlr; 709 709 } 710 710 ··· 728 728 */ 729 729 static void zynq_qspi_remove(struct platform_device *pdev) 730 730 { 731 - struct zynq_qspi *xqspi = platform_get_drvdata(pdev); 731 + struct spi_controller *ctlr = platform_get_drvdata(pdev); 732 + struct zynq_qspi *xqspi = spi_controller_get_devdata(ctlr); 733 + 734 + spi_controller_get(ctlr); 735 + 736 + spi_unregister_controller(ctlr); 732 737 733 738 zynq_qspi_write(xqspi, ZYNQ_QSPI_ENABLE_OFFSET, 0); 739 + 740 + spi_controller_put(ctlr); 734 741 } 735 742 736 743 static const struct of_device_id zynq_qspi_of_match[] = {