diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:24:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:55 -0500 |
commit | e38921d4dd7d2f052c1c2344fac307463c3b8d2d (patch) | |
tree | db35ef9ad2a356477ec8434a816a501ad39df3ed | |
parent | f73d12bd298f9614d8600326e9bd1f7871fcde4b (diff) |
net/davinci_emac: 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>
-rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/davinci_mdio.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index fce89a0ab06..2a3e2c56bc6 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c | |||
@@ -1850,7 +1850,7 @@ static struct emac_platform_data | |||
1850 | * resource information from platform init and register a network device | 1850 | * resource information from platform init and register a network device |
1851 | * and allocate resources necessary for driver to perform | 1851 | * and allocate resources necessary for driver to perform |
1852 | */ | 1852 | */ |
1853 | static int __devinit davinci_emac_probe(struct platform_device *pdev) | 1853 | static int davinci_emac_probe(struct platform_device *pdev) |
1854 | { | 1854 | { |
1855 | int rc = 0; | 1855 | int rc = 0; |
1856 | struct resource *res; | 1856 | struct resource *res; |
@@ -2039,7 +2039,7 @@ no_ndev: | |||
2039 | * Called when removing the device driver. We disable clock usage and release | 2039 | * Called when removing the device driver. We disable clock usage and release |
2040 | * the resources taken up by the driver and unregister network device | 2040 | * the resources taken up by the driver and unregister network device |
2041 | */ | 2041 | */ |
2042 | static int __devexit davinci_emac_remove(struct platform_device *pdev) | 2042 | static int davinci_emac_remove(struct platform_device *pdev) |
2043 | { | 2043 | { |
2044 | struct resource *res; | 2044 | struct resource *res; |
2045 | struct net_device *ndev = platform_get_drvdata(pdev); | 2045 | struct net_device *ndev = platform_get_drvdata(pdev); |
@@ -2107,7 +2107,7 @@ static struct platform_driver davinci_emac_driver = { | |||
2107 | .of_match_table = of_match_ptr(davinci_emac_of_match), | 2107 | .of_match_table = of_match_ptr(davinci_emac_of_match), |
2108 | }, | 2108 | }, |
2109 | .probe = davinci_emac_probe, | 2109 | .probe = davinci_emac_probe, |
2110 | .remove = __devexit_p(davinci_emac_remove), | 2110 | .remove = davinci_emac_remove, |
2111 | }; | 2111 | }; |
2112 | 2112 | ||
2113 | /** | 2113 | /** |
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c index ae74280c0b9..cca25509b03 100644 --- a/drivers/net/ethernet/ti/davinci_mdio.c +++ b/drivers/net/ethernet/ti/davinci_mdio.c | |||
@@ -310,7 +310,7 @@ static int davinci_mdio_probe_dt(struct mdio_platform_data *data, | |||
310 | } | 310 | } |
311 | 311 | ||
312 | 312 | ||
313 | static int __devinit davinci_mdio_probe(struct platform_device *pdev) | 313 | static int davinci_mdio_probe(struct platform_device *pdev) |
314 | { | 314 | { |
315 | struct mdio_platform_data *pdata = pdev->dev.platform_data; | 315 | struct mdio_platform_data *pdata = pdev->dev.platform_data; |
316 | struct device *dev = &pdev->dev; | 316 | struct device *dev = &pdev->dev; |
@@ -416,7 +416,7 @@ bail_out: | |||
416 | return ret; | 416 | return ret; |
417 | } | 417 | } |
418 | 418 | ||
419 | static int __devexit davinci_mdio_remove(struct platform_device *pdev) | 419 | static int davinci_mdio_remove(struct platform_device *pdev) |
420 | { | 420 | { |
421 | struct device *dev = &pdev->dev; | 421 | struct device *dev = &pdev->dev; |
422 | struct davinci_mdio_data *data = dev_get_drvdata(dev); | 422 | struct davinci_mdio_data *data = dev_get_drvdata(dev); |
@@ -496,7 +496,7 @@ static struct platform_driver davinci_mdio_driver = { | |||
496 | .of_match_table = of_match_ptr(davinci_mdio_of_mtable), | 496 | .of_match_table = of_match_ptr(davinci_mdio_of_mtable), |
497 | }, | 497 | }, |
498 | .probe = davinci_mdio_probe, | 498 | .probe = davinci_mdio_probe, |
499 | .remove = __devexit_p(davinci_mdio_remove), | 499 | .remove = davinci_mdio_remove, |
500 | }; | 500 | }; |
501 | 501 | ||
502 | static int __init davinci_mdio_init(void) | 502 | static int __init davinci_mdio_init(void) |