drop a 5.10 patch

diff --git a/queue-5.10/series b/queue-5.10/series
index e98217db0fb86f3a30e04177cd589775ebb460bf..c5cc97a951c0f9ebda7f9e6cd49e9c3d3af54557 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -199,7 +199,6 @@ ipmi-check-event-message-buffer-response-for-bad-data.patch
 ipmi-si-return-state-to-normal-if-message-allocation-fails.patch
 fbdev-udlfb-add-vm_ops-to-dlfb_ops_mmap-to-prevent-use-after-free.patch
 acpi-video-force-native-backlight-on-hp-omen-16-8a44.patch
-spi-rockchip-fix-controller-deregistration.patch
 net-sched-sch_red-replace-direct-dequeue-call-with-peek-and-qdisc_dequeue_peeked.patch
 ipmi-ssif-fix-a-shutdown-race.patch
 ipmi-ssif-clean-up-kthread-on-errors.patch

diff --git a/queue-5.10/spi-rockchip-fix-controller-deregistration.patch b/queue-5.10/spi-rockchip-fix-controller-deregistration.patch
deleted file mode 100644 (file)
index ef6bc57..0000000
--- a/queue-5.10/spi-rockchip-fix-controller-deregistration.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 53e7a16070feb7d1d4d81a583eaac5e25048b9c3 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Tue, 24 Mar 2026 09:23:23 +0100
-Subject: spi: rockchip: fix controller deregistration
-
-From: Johan Hovold <johan@kernel.org>
-
-commit 53e7a16070feb7d1d4d81a583eaac5e25048b9c3 upstream.
-
-Make sure to deregister the controller before freeing underlying
-resources like DMA channels during driver unbind.
-
-Fixes: 64e36824b32b ("spi/rockchip: add driver for Rockchip RK3xxx SoCs integrated SPI")
-Cc: stable@vger.kernel.org     # 3.17
-Cc: addy ke <addy.ke@rock-chips.com>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Link: https://patch.msgid.link/20260324082326.901043-3-johan@kernel.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/spi/spi-rockchip.c |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/spi/spi-rockchip.c
-+++ b/drivers/spi/spi-rockchip.c
-@@ -792,7 +792,7 @@ static int rockchip_spi_probe(struct pla
-               ctlr->can_dma = rockchip_spi_can_dma;
-       }
- 
--      ret = devm_spi_register_controller(&pdev->dev, ctlr);
-+      ret = spi_register_controller(ctlr);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to register controller\n");
-               goto err_free_dma_rx;
-@@ -828,6 +828,8 @@ static int rockchip_spi_remove(struct pl
-       clk_disable_unprepare(rs->spiclk);
-       clk_disable_unprepare(rs->apb_pclk);
- 
-+      spi_unregister_controller(ctlr);
-+
-       pm_runtime_put_noidle(&pdev->dev);
-       pm_runtime_disable(&pdev->dev);
-       pm_runtime_set_suspended(&pdev->dev);