spi: bcm63xx: fix controller deregistration

Make sure to deregister the controller before disabling underlying
resources like clocks during driver unbind.

Fixes: b42dfed83d95 ("spi: add Broadcom BCM63xx SPI controller driver")
Cc: stable@vger.kernel.org	# 3.4
Cc: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260409120419.388546-6-johan@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c
index 47266bb23a33cfb2cd6742247fe18a9d6ad41e8d..40cd7efc4b54eda61aeffc711ae062a06be454e6 100644 (file)
--- a/drivers/spi/spi-bcm63xx.c
+++ b/drivers/spi/spi-bcm63xx.c
@@ -602,7 +602,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
                goto out_clk_disable;
 
        /* register and we are done */
-       ret = devm_spi_register_controller(dev, host);
+       ret = spi_register_controller(host);
        if (ret) {
                dev_err(dev, "spi register failed\n");
                goto out_clk_disable;
@@ -625,11 +625,17 @@ static void bcm63xx_spi_remove(struct platform_device *pdev)
        struct spi_controller *host = platform_get_drvdata(pdev);
        struct bcm63xx_spi *bs = spi_controller_get_devdata(host);
 
+       spi_controller_get(host);
+
+       spi_unregister_controller(host);
+
        /* reset spi block */
        bcm_spi_writeb(bs, 0, SPI_INT_MASK);
 
        /* HW shutdown */
        clk_disable_unprepare(bs->clk);
+
+       spi_controller_put(host);
 }
 
 static int bcm63xx_spi_suspend(struct device *dev)