Skip to content

Commit fc53b04

Browse files
libiuncAnsuel
authored andcommitted
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 <[email protected]> [ improve commit description ] Link: openwrt/openwrt#20555 Signed-off-by: Christian Marangi <[email protected]>
1 parent 25c6c26 commit fc53b04

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sf_dpns.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ MODULE_DEVICE_TABLE(of, dpns_match);
6868

6969
static struct platform_driver dpns_driver = {
7070
.probe = dpns_probe,
71-
.remove_new = dpns_remove,
71+
.remove = dpns_remove,
7272
.driver = {
7373
.name = "sfdpns",
7474
.of_match_table = dpns_match,

target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac-dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@ MODULE_DEVICE_TABLE(of, xgmac_dma_match);
16061606

16071607
static struct platform_driver xgmac_dma_driver = {
16081608
.probe = xgmac_dma_probe,
1609-
.remove_new = xgmac_dma_remove,
1609+
.remove = xgmac_dma_remove,
16101610
.driver = {
16111611
.name = "sfxgmac_dma",
16121612
.of_match_table = xgmac_dma_match,

target/linux/siflower/files-6.12/drivers/net/ethernet/siflower/sfxgmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@ MODULE_DEVICE_TABLE(of, xgmac_match);
12881288

12891289
static struct platform_driver xgmac_driver = {
12901290
.probe = xgmac_probe,
1291-
.remove_new = xgmac_remove,
1291+
.remove = xgmac_remove,
12921292
.driver = {
12931293
.name = "sfxgmac",
12941294
.of_match_table = xgmac_match,

target/linux/siflower/files-6.12/drivers/net/ethernet/stmicro/stmmac/dwmac-sf19a2890.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ MODULE_DEVICE_TABLE(of, dwmac_sf19a2890_match);
172172

173173
static struct platform_driver sf19a2890_gmac_driver = {
174174
.probe = sf19a2890_gmac_probe,
175-
.remove_new = stmmac_pltfr_remove,
175+
.remove = stmmac_pltfr_remove,
176176
.driver = {
177177
.name = "sf19a2890-gmac",
178178
.pm = &stmmac_pltfr_pm_ops,

0 commit comments

Comments
 (0)