|
@@ -1484,7 +1484,7 @@ static int fec_enet_init(struct net_device *ndev)
|
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_OF
|
|
|
-static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev)
|
|
|
+static int fec_get_phy_mode_dt(struct platform_device *pdev)
|
|
|
{
|
|
|
struct device_node *np = pdev->dev.of_node;
|
|
|
|
|
@@ -1494,7 +1494,7 @@ static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
-static void __devinit fec_reset_phy(struct platform_device *pdev)
|
|
|
+static void fec_reset_phy(struct platform_device *pdev)
|
|
|
{
|
|
|
int err, phy_reset;
|
|
|
int msec = 1;
|
|
@@ -1533,7 +1533,7 @@ static inline void fec_reset_phy(struct platform_device *pdev)
|
|
|
}
|
|
|
#endif /* CONFIG_OF */
|
|
|
|
|
|
-static int __devinit
|
|
|
+static int
|
|
|
fec_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct fec_enet_private *fep;
|
|
@@ -1701,7 +1701,7 @@ failed_alloc_etherdev:
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
-static int __devexit
|
|
|
+static int
|
|
|
fec_drv_remove(struct platform_device *pdev)
|
|
|
{
|
|
|
struct net_device *ndev = platform_get_drvdata(pdev);
|
|
@@ -1790,7 +1790,7 @@ static struct platform_driver fec_driver = {
|
|
|
},
|
|
|
.id_table = fec_devtype,
|
|
|
.probe = fec_probe,
|
|
|
- .remove = __devexit_p(fec_drv_remove),
|
|
|
+ .remove = fec_drv_remove,
|
|
|
};
|
|
|
|
|
|
module_platform_driver(fec_driver);
|