[openwrt/openwrt] siflower: 6.12: change .remove_new callback to .remove
LEDE Commits
lede-commits at lists.infradead.org
Wed Nov 19 11:57:47 PST 2025
ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/fc53b0416092a9960e6538f66e73f3fea04020bb
commit fc53b0416092a9960e6538f66e73f3fea04020bb
Author: Zhu Yujie <libriunc at gmail.com>
AuthorDate: Wed Nov 19 19:46:32 2025 +0800
siflower: 6.12: change .remove_new callback to .remove
Move back to .remove from .remove_new as kernel 6.12 unified the usage
of .remove and .remove_new (and .remove_new is expected to be dropped in
later version)
Signed-off-by: Zhu Yujie <libriunc at gmail.com>
[ improve commit description ]
Link: https://github.com/openwrt/openwrt/pull/20555
Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
.../linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c | 2 +-
.../siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c | 2 +-
.../linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c | 2 +-
.../files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
index 1cd5262c0a..67c949f56a 100644
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c
@@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, dpns_match);
static struct platform_driver dpns_driver = {
.probe = dpns_probe,
- .remove_new = dpns_remove,
+ .remove = dpns_remove,
.driver = {
.name = "sfdpns",
.of_match_table = dpns_match,
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
index 2575ea180f..8143bd078d 100644
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c
@@ -1606,7 +1606,7 @@ MODULE_DEVICE_TABLE(of, xgmac_dma_match);
static struct platform_driver xgmac_dma_driver = {
.probe = xgmac_dma_probe,
- .remove_new = xgmac_dma_remove,
+ .remove = xgmac_dma_remove,
.driver = {
.name = "sfxgmac_dma",
.of_match_table = xgmac_dma_match,
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
index bd111ae5bb..bf0e023bb0 100644
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c
@@ -1288,7 +1288,7 @@ MODULE_DEVICE_TABLE(of, xgmac_match);
static struct platform_driver xgmac_driver = {
.probe = xgmac_probe,
- .remove_new = xgmac_remove,
+ .remove = xgmac_remove,
.driver = {
.name = "sfxgmac",
.of_match_table = xgmac_match,
diff --git a/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c b/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
index 5a0024f827..79964fa9e3 100644
--- a/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
+++ b/target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c
@@ -172,7 +172,7 @@ MODULE_DEVICE_TABLE(of, dwmac_sf19a2890_match);
static struct platform_driver sf19a2890_gmac_driver = {
.probe = sf19a2890_gmac_probe,
- .remove_new = stmmac_pltfr_remove,
+ .remove = stmmac_pltfr_remove,
.driver = {
.name = "sf19a2890-gmac",
.pm = &stmmac_pltfr_pm_ops,
More information about the lede-commits
mailing list