diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:54 -0500 |
commit | 33897cc869eef8b878b2408f77b7b0387e43e74e (patch) | |
tree | 303aaa53a81e4e73323edf736d33522cb0aa5bee /drivers | |
parent | 37a5b3d5315ab8c354ec147e26b3870dd5c93813 (diff) |
net/freescale: remove __dev* attributes
CONFIG_HOTPLUG is going away as an option. As result the __dev*
markings will be going away.
Remove use of __devinit, __devexit_p, __devinitdata, __devinitconst,
and __devexit.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/freescale/fec.c | 10 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/fec_mpc52xx.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/freescale/xgmac_mdio.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec.c index 2665162ff4e5..0704bcab178a 100644 --- a/drivers/net/ethernet/freescale/fec.c +++ b/drivers/net/ethernet/freescale/fec.c | |||
@@ -1484,7 +1484,7 @@ static int fec_enet_init(struct net_device *ndev) | |||
1484 | } | 1484 | } |
1485 | 1485 | ||
1486 | #ifdef CONFIG_OF | 1486 | #ifdef CONFIG_OF |
1487 | static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev) | 1487 | static int fec_get_phy_mode_dt(struct platform_device *pdev) |
1488 | { | 1488 | { |
1489 | struct device_node *np = pdev->dev.of_node; | 1489 | struct device_node *np = pdev->dev.of_node; |
1490 | 1490 | ||
@@ -1494,7 +1494,7 @@ static int __devinit fec_get_phy_mode_dt(struct platform_device *pdev) | |||
1494 | return -ENODEV; | 1494 | return -ENODEV; |
1495 | } | 1495 | } |
1496 | 1496 | ||
1497 | static void __devinit fec_reset_phy(struct platform_device *pdev) | 1497 | static void fec_reset_phy(struct platform_device *pdev) |
1498 | { | 1498 | { |
1499 | int err, phy_reset; | 1499 | int err, phy_reset; |
1500 | int msec = 1; | 1500 | int msec = 1; |
@@ -1533,7 +1533,7 @@ static inline void fec_reset_phy(struct platform_device *pdev) | |||
1533 | } | 1533 | } |
1534 | #endif /* CONFIG_OF */ | 1534 | #endif /* CONFIG_OF */ |
1535 | 1535 | ||
1536 | static int __devinit | 1536 | static int |
1537 | fec_probe(struct platform_device *pdev) | 1537 | fec_probe(struct platform_device *pdev) |
1538 | { | 1538 | { |
1539 | struct fec_enet_private *fep; | 1539 | struct fec_enet_private *fep; |
@@ -1701,7 +1701,7 @@ failed_alloc_etherdev: | |||
1701 | return ret; | 1701 | return ret; |
1702 | } | 1702 | } |
1703 | 1703 | ||
1704 | static int __devexit | 1704 | static int |
1705 | fec_drv_remove(struct platform_device *pdev) | 1705 | fec_drv_remove(struct platform_device *pdev) |
1706 | { | 1706 | { |
1707 | struct net_device *ndev = platform_get_drvdata(pdev); | 1707 | struct net_device *ndev = platform_get_drvdata(pdev); |
@@ -1790,7 +1790,7 @@ static struct platform_driver fec_driver = { | |||
1790 | }, | 1790 | }, |
1791 | .id_table = fec_devtype, | 1791 | .id_table = fec_devtype, |
1792 | .probe = fec_probe, | 1792 | .probe = fec_probe, |
1793 | .remove = __devexit_p(fec_drv_remove), | 1793 | .remove = fec_drv_remove, |
1794 | }; | 1794 | }; |
1795 | 1795 | ||
1796 | module_platform_driver(fec_driver); | 1796 | module_platform_driver(fec_driver); |
diff --git a/drivers/net/ethernet/freescale/fec_mpc52xx.c b/drivers/net/ethernet/freescale/fec_mpc52xx.c index 2933d08b036e..817d081d2cd8 100644 --- a/drivers/net/ethernet/freescale/fec_mpc52xx.c +++ b/drivers/net/ethernet/freescale/fec_mpc52xx.c | |||
@@ -845,7 +845,7 @@ static const struct net_device_ops mpc52xx_fec_netdev_ops = { | |||
845 | /* OF Driver */ | 845 | /* OF Driver */ |
846 | /* ======================================================================== */ | 846 | /* ======================================================================== */ |
847 | 847 | ||
848 | static int __devinit mpc52xx_fec_probe(struct platform_device *op) | 848 | static int mpc52xx_fec_probe(struct platform_device *op) |
849 | { | 849 | { |
850 | int rv; | 850 | int rv; |
851 | struct net_device *ndev; | 851 | struct net_device *ndev; |
diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c index 1afb5ea2a984..418068b941b1 100644 --- a/drivers/net/ethernet/freescale/xgmac_mdio.c +++ b/drivers/net/ethernet/freescale/xgmac_mdio.c | |||
@@ -189,7 +189,7 @@ static int xgmac_mdio_reset(struct mii_bus *bus) | |||
189 | return ret; | 189 | return ret; |
190 | } | 190 | } |
191 | 191 | ||
192 | static int __devinit xgmac_mdio_probe(struct platform_device *pdev) | 192 | static int xgmac_mdio_probe(struct platform_device *pdev) |
193 | { | 193 | { |
194 | struct device_node *np = pdev->dev.of_node; | 194 | struct device_node *np = pdev->dev.of_node; |
195 | struct mii_bus *bus; | 195 | struct mii_bus *bus; |
@@ -240,7 +240,7 @@ err_ioremap: | |||
240 | return ret; | 240 | return ret; |
241 | } | 241 | } |
242 | 242 | ||
243 | static int __devexit xgmac_mdio_remove(struct platform_device *pdev) | 243 | static int xgmac_mdio_remove(struct platform_device *pdev) |
244 | { | 244 | { |
245 | struct mii_bus *bus = dev_get_drvdata(&pdev->dev); | 245 | struct mii_bus *bus = dev_get_drvdata(&pdev->dev); |
246 | 246 | ||