bmips: convert driver to .remove_new

Convert driver to .remove_new in preparation for kernel 6.12 support.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/18535
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
index 5e5259a4920f7d87e7879ee3f6122b879aeaa8df..c753918e933c371d307804ad9d9099e7a8f03a0b 100644 (file)
--- a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
+++ b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6348-enet.c
@@ -1675,7 +1675,7 @@ out_disable_clk:
        return ret;
 }
 
-static int bcm6348_emac_remove(struct platform_device *pdev)
+static void bcm6348_emac_remove(struct platform_device *pdev)
 {
        struct net_device *ndev = platform_get_drvdata(pdev);
        struct bcm6348_emac *emac = netdev_priv(ndev);
@@ -1688,8 +1688,6 @@ static int bcm6348_emac_remove(struct platform_device *pdev)
 
        for (i = 0; i < emac->num_clocks; i++)
                clk_disable_unprepare(emac->clock[i]);
-
-       return 0;
 }
 
 static const struct of_device_id bcm6348_emac_of_match[] = {
@@ -1706,7 +1704,7 @@ static struct platform_driver bcm6348_emac_driver = {
                .of_match_table = of_match_ptr(bcm6348_emac_of_match),
        },
        .probe  = bcm6348_emac_probe,
-       .remove = bcm6348_emac_remove,
+       .remove_new     = bcm6348_emac_remove,
 };
 
 int bcm6348_iudma_drivers_register(struct platform_device *pdev)

diff --git a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
index 7031a744909a828618387a3375be78229f4e6a96..456a7f393ec4ea3e76394b344c1139a2fbd17911 100644 (file)
--- a/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
+++ b/target/linux/bmips/files/drivers/net/ethernet/broadcom/bcm6368-enetsw.c
@@ -1100,7 +1100,7 @@ out_disable_clk:
        return ret;
 }
 
-static int bcm6368_enetsw_remove(struct platform_device *pdev)
+static void bcm6368_enetsw_remove(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct net_device *ndev = platform_get_drvdata(pdev);
@@ -1118,8 +1118,6 @@ static int bcm6368_enetsw_remove(struct platform_device *pdev)
 
        for (i = 0; i < priv->num_clocks; i++)
                clk_disable_unprepare(priv->clock[i]);
-
-       return 0;
 }
 
 static const struct of_device_id bcm6368_enetsw_of_match[] = {
@@ -1138,7 +1136,7 @@ static struct platform_driver bcm6368_enetsw_driver = {
                .of_match_table = of_match_ptr(bcm6368_enetsw_of_match),
        },
        .probe  = bcm6368_enetsw_probe,
-       .remove = bcm6368_enetsw_remove,
+       .remove_new     = bcm6368_enetsw_remove,
 };
 module_platform_driver(bcm6368_enetsw_driver);