FAILED: patch "[PATCH] spi: topcliff-pch: fix controller deregistration" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 5d6f477d6fc0767c57c5e1e6f55a1662820eef87
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026051240-sleep-zen-7409@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 5d6f477d6fc0767c57c5e1e6f55a1662820eef87 Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Tue, 14 Apr 2026 15:43:18 +0200
Subject: [PATCH] spi: topcliff-pch: fix controller deregistration
Make sure to deregister the controller before disabling and releasing underlying resources like interrupts and DMA during driver unbind.
drivers/spi/spi-topcliff-pch.c +6 -1
@@ -1406,6 +1406,10 @@ static void pch_spi_pd_remove(struct platform_device *plat_dev)dev_dbg (&plat_dev->dev,"%s:[ch%d] irq=%d\n" , __func__, plat_dev->id, board_dat->pdev->irq); +spi_controller_get (data->host); + +spi_unregister_controller (data->host); +if (use_dma)pch_free_dma_buf (board_dat, data);
@@ -1433,7 +1437,8 @@ static void pch_spi_pd_remove(struct platform_device *plat_dev) }pci_iounmap (board_dat->pdev, data->io_remap_addr); -spi_unregister_controller (data->host); + +spi_controller_put (data->host); }#ifdef CONFIG_PM static int pch_spi_pd_suspend(struct platform_device *pd_dev,
Sasha Levin
maintainerPATCH 1/2 spi: topcliff-pch: Convert to platform remove callback returning void
From: Uwe Kleine-König <[email protected]>
[ Upstream commit b082694f18bdff807b42a3bccc62c3a524168f23 ]
The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void.
Trivially convert this driver from always returning zero in the remove callback to the void returning variant.
Stable-dep-of: 5d6f477d6fc0 ("spi: topcliff-pch: fix controller deregistration")
--- drivers/spi/spi-topcliff-pch.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/spi/spi-topcliff-pch.c +2 -4
@@ -1417,7 +1417,7 @@ static int pch_spi_pd_probe(struct platform_device *plat_dev)return ret; } -static int pch_spi_pd_remove (struct platform_device *plat_dev) +static void pch_spi_pd_remove (struct platform_device *plat_dev) {struct pch_spi_board_data *board_dat =dev_get_platdata (&plat_dev->dev);struct pch_spi_data *data =platform_get_drvdata (plat_dev);
@@ -1455,8 +1455,6 @@ static int pch_spi_pd_remove(struct platform_device *plat_dev)pci_iounmap (board_dat->pdev, data->io_remap_addr);spi_unregister_master (data->master); - -return 0 ; }#ifdef CONFIG_PM static int pch_spi_pd_suspend(struct platform_device *pd_dev,
@@ -1537,7 +1535,7 @@ static struct platform_driver pch_spi_pd_driver = { .name = "pch-spi", }, .probe = pch_spi_pd_probe, - .remove = pch_spi_pd_remove, + .remove_new = pch_spi_pd_remove, .suspend = pch_spi_pd_suspend, .resume = pch_spi_pd_resume };
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 spi: topcliff-pch: fix controller deregistration
From: Johan Hovold <[email protected]>
[ Upstream commit 5d6f477d6fc0767c57c5e1e6f55a1662820eef87 ]
Make sure to deregister the controller before disabling and releasing underlying resources like interrupts and DMA during driver unbind.
--- drivers/spi/spi-topcliff-pch.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/spi/spi-topcliff-pch.c +6 -1
@@ -1427,6 +1427,10 @@ static void pch_spi_pd_remove(struct platform_device *plat_dev)dev_dbg (&plat_dev->dev,"%s:[ch%d] irq=%d\n" , __func__, plat_dev->id, board_dat->pdev->irq); +spi_master_get (data->master); + +spi_unregister_master (data->master); +if (use_dma)pch_free_dma_buf (board_dat, data);
@@ -1454,7 +1458,8 @@ static void pch_spi_pd_remove(struct platform_device *plat_dev) }pci_iounmap (board_dat->pdev, data->io_remap_addr); -spi_unregister_master (data->master); + +spi_master_put (data->master); }#ifdef CONFIG_PM static int pch_spi_pd_suspend(struct platform_device *pd_dev,
Signature · 1 line
2.53.0