Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

realtek: use remove_new

Browse source 
Easy compability fix for kernel 6.12.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18660
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Rosen Penev 2025-04-26 15:34:51 -07:00 committed by Christian Marangi
parent aa4c96b925
commit 576278a507
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
4 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
target/linux/mediatek/files-6.6/drivers/net/dsa/an8855.c
View file

@ -2278,15 +2278,12 @@ static int an8855_switch_probe(struct platform_device *pdev)
return dsa_register_switch(priv->ds); return dsa_register_switch(priv->ds);
} }
static int an8855_switch_remove(struct platform_device *pdev) static void an8855_switch_remove(struct platform_device *pdev)
{ {
struct an8855_priv *priv = dev_get_drvdata(&pdev->dev); struct an8855_priv *priv = dev_get_drvdata(&pdev->dev);
if (!priv) if (priv)
return 0;
dsa_unregister_switch(priv->ds); dsa_unregister_switch(priv->ds);
return 0;
} }
static const struct of_device_id an8855_switch_of_match[] = { static const struct of_device_id an8855_switch_of_match[] = {
@ -2297,7 +2294,7 @@ MODULE_DEVICE_TABLE(of, an8855_switch_of_match);
static struct platform_driver an8855_switch_driver = { static struct platform_driver an8855_switch_driver = {
.probe = an8855_switch_probe, .probe = an8855_switch_probe,
.remove = an8855_switch_remove, .remove_new = an8855_switch_remove,
.driver = { .driver = {
.name = "an8855-switch", .name = "an8855-switch",
.of_match_table = an8855_switch_of_match, .of_match_table = an8855_switch_of_match,

6
target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/common.c
View file

@ -1718,12 +1718,10 @@ err_register_nb:
return err; return err;
} }
static int rtl83xx_sw_remove(struct platform_device *pdev) static void rtl83xx_sw_remove(struct platform_device *pdev)
{ {
/* TODO: */ /* TODO: */
pr_debug("Removing platform driver for rtl83xx-sw\n"); pr_debug("Removing platform driver for rtl83xx-sw\n");
return 0;
} }
static const struct of_device_id rtl83xx_switch_of_ids[] = { static const struct of_device_id rtl83xx_switch_of_ids[] = {
@ -1736,7 +1734,7 @@ MODULE_DEVICE_TABLE(of, rtl83xx_switch_of_ids);
static struct platform_driver rtl83xx_switch_driver = { static struct platform_driver rtl83xx_switch_driver = {
.probe = rtl83xx_sw_probe, .probe = rtl83xx_sw_probe,
.remove = rtl83xx_sw_remove, .remove_new = rtl83xx_sw_remove,
.driver = { .driver = {
.name = "rtl83xx-switch", .name = "rtl83xx-switch",
.pm = NULL, .pm = NULL,

6
target/linux/realtek/files-6.6/drivers/net/ethernet/rtl838x_eth.c
View file

@ -2656,7 +2656,7 @@ static int __init rtl838x_eth_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int rtl838x_eth_remove(struct platform_device *pdev) static void rtl838x_eth_remove(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct rtl838x_eth_priv *priv = netdev_priv(dev); struct rtl838x_eth_priv *priv = netdev_priv(dev);
@ -2670,8 +2670,6 @@ static int rtl838x_eth_remove(struct platform_device *pdev)
for (int i = 0; i < priv->rxrings; i++) for (int i = 0; i < priv->rxrings; i++)
netif_napi_del(&priv->rx_qs[i].napi); netif_napi_del(&priv->rx_qs[i].napi);
} }
return 0;
} }
static const struct of_device_id rtl838x_eth_of_ids[] = { static const struct of_device_id rtl838x_eth_of_ids[] = {
@ -2682,7 +2680,7 @@ MODULE_DEVICE_TABLE(of, rtl838x_eth_of_ids);
static struct platform_driver rtl838x_eth_driver = { static struct platform_driver rtl838x_eth_driver = {
.probe = rtl838x_eth_probe, .probe = rtl838x_eth_probe,
.remove = rtl838x_eth_remove, .remove_new = rtl838x_eth_remove,
.driver = { .driver = {
.name = "rtl838x-eth", .name = "rtl838x-eth",
.pm = NULL, .pm = NULL,

5
target/linux/siflower/files-6.6/drivers/net/ethernet/siflower/sf_dpns.c
View file

@ -49,11 +49,10 @@ static int dpns_probe(struct platform_device *pdev)
return 0; return 0;
} }
static int dpns_remove(struct platform_device *pdev) { static void dpns_remove(struct platform_device *pdev) {
struct dpns_priv *priv = platform_get_drvdata(pdev); struct dpns_priv *priv = platform_get_drvdata(pdev);
debugfs_remove_recursive(priv->debugfs); debugfs_remove_recursive(priv->debugfs);
reset_control_assert(priv->npu_rst); reset_control_assert(priv->npu_rst);
return 0;
} }
static const struct of_device_id dpns_match[] = { static const struct of_device_id dpns_match[] = {
@ -64,7 +63,7 @@ MODULE_DEVICE_TABLE(of, dpns_match);
static struct platform_driver dpns_driver = { static struct platform_driver dpns_driver = {
.probe = dpns_probe, .probe = dpns_probe,
.remove = dpns_remove, .remove_new = dpns_remove,
.driver = { .driver = {
.name = "sfdpns", .name = "sfdpns",
.of_match_table = dpns_match, .of_match_table = dpns_match,