net: fs_enet: Convert to platform remove callback returning void

[platform/kernel/linux-rpi.git] / drivers / net / ethernet / freescale / fs_enet / fs_enet-main.c

diff --git a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
index 8844a9a..f9f5b28 100644 (file)
--- a/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
+++ b/drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c
@@ -1051,7 +1051,7 @@ out_free_fpi:
        return ret;
 }
 
-static int fs_enet_remove(struct platform_device *ofdev)
+static void fs_enet_remove(struct platform_device *ofdev)
 {
        struct net_device *ndev = platform_get_drvdata(ofdev);
        struct fs_enet_private *fep = netdev_priv(ndev);
@@ -1066,7 +1066,6 @@ static int fs_enet_remove(struct platform_device *ofdev)
        if (of_phy_is_fixed_link(ofdev->dev.of_node))
                of_phy_deregister_fixed_link(ofdev->dev.of_node);
        free_netdev(ndev);
-       return 0;
 }
 
 static const struct of_device_id fs_enet_match[] = {
@@ -1113,7 +1112,7 @@ static struct platform_driver fs_enet_driver = {
                .of_match_table = fs_enet_match,
        },
        .probe = fs_enet_probe,
-       .remove = fs_enet_remove,
+       .remove_new = fs_enet_remove,
 };
 
 #ifdef CONFIG_NET_POLL_CONTROLLER