diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:38 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:52 -0500 |
| commit | 8489ec1f97006495d9eb06a90f1ffcbfeb879aab (patch) | |
| tree | d4b136117431febc1f27760f01ec45d014897c6f /drivers/net/ethernet/smsc | |
| parent | 1e48fea4805db6766708d9387f8dc1c5d5226263 (diff) | |
smsc911x: 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>
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/smsc')
| -rw-r--r-- | drivers/net/ethernet/smsc/smsc911x.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index cc025620b681..c52a5cefa192 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c | |||
| @@ -1031,7 +1031,7 @@ static int smsc911x_mii_probe(struct net_device *dev) | |||
| 1031 | return 0; | 1031 | return 0; |
| 1032 | } | 1032 | } |
| 1033 | 1033 | ||
| 1034 | static int __devinit smsc911x_mii_init(struct platform_device *pdev, | 1034 | static int smsc911x_mii_init(struct platform_device *pdev, |
| 1035 | struct net_device *dev) | 1035 | struct net_device *dev) |
| 1036 | { | 1036 | { |
| 1037 | struct smsc911x_data *pdata = netdev_priv(dev); | 1037 | struct smsc911x_data *pdata = netdev_priv(dev); |
| @@ -2087,7 +2087,7 @@ static const struct net_device_ops smsc911x_netdev_ops = { | |||
| 2087 | }; | 2087 | }; |
| 2088 | 2088 | ||
| 2089 | /* copies the current mac address from hardware to dev->dev_addr */ | 2089 | /* copies the current mac address from hardware to dev->dev_addr */ |
| 2090 | static void __devinit smsc911x_read_mac_address(struct net_device *dev) | 2090 | static void smsc911x_read_mac_address(struct net_device *dev) |
| 2091 | { | 2091 | { |
| 2092 | struct smsc911x_data *pdata = netdev_priv(dev); | 2092 | struct smsc911x_data *pdata = netdev_priv(dev); |
| 2093 | u32 mac_high16 = smsc911x_mac_read(pdata, ADDRH); | 2093 | u32 mac_high16 = smsc911x_mac_read(pdata, ADDRH); |
| @@ -2102,7 +2102,7 @@ static void __devinit smsc911x_read_mac_address(struct net_device *dev) | |||
| 2102 | } | 2102 | } |
| 2103 | 2103 | ||
| 2104 | /* Initializing private device structures, only called from probe */ | 2104 | /* Initializing private device structures, only called from probe */ |
| 2105 | static int __devinit smsc911x_init(struct net_device *dev) | 2105 | static int smsc911x_init(struct net_device *dev) |
| 2106 | { | 2106 | { |
| 2107 | struct smsc911x_data *pdata = netdev_priv(dev); | 2107 | struct smsc911x_data *pdata = netdev_priv(dev); |
| 2108 | unsigned int byte_test, mask; | 2108 | unsigned int byte_test, mask; |
| @@ -2239,7 +2239,7 @@ static int __devinit smsc911x_init(struct net_device *dev) | |||
| 2239 | return 0; | 2239 | return 0; |
| 2240 | } | 2240 | } |
| 2241 | 2241 | ||
| 2242 | static int __devexit smsc911x_drv_remove(struct platform_device *pdev) | 2242 | static int smsc911x_drv_remove(struct platform_device *pdev) |
| 2243 | { | 2243 | { |
| 2244 | struct net_device *dev; | 2244 | struct net_device *dev; |
| 2245 | struct smsc911x_data *pdata; | 2245 | struct smsc911x_data *pdata; |
| @@ -2296,7 +2296,7 @@ static const struct smsc911x_ops shifted_smsc911x_ops = { | |||
| 2296 | }; | 2296 | }; |
| 2297 | 2297 | ||
| 2298 | #ifdef CONFIG_OF | 2298 | #ifdef CONFIG_OF |
| 2299 | static int __devinit smsc911x_probe_config_dt( | 2299 | static int smsc911x_probe_config_dt( |
| 2300 | struct smsc911x_platform_config *config, | 2300 | struct smsc911x_platform_config *config, |
| 2301 | struct device_node *np) | 2301 | struct device_node *np) |
| 2302 | { | 2302 | { |
| @@ -2346,7 +2346,7 @@ static inline int smsc911x_probe_config_dt( | |||
| 2346 | } | 2346 | } |
| 2347 | #endif /* CONFIG_OF */ | 2347 | #endif /* CONFIG_OF */ |
| 2348 | 2348 | ||
| 2349 | static int __devinit smsc911x_drv_probe(struct platform_device *pdev) | 2349 | static int smsc911x_drv_probe(struct platform_device *pdev) |
| 2350 | { | 2350 | { |
| 2351 | struct device_node *np = pdev->dev.of_node; | 2351 | struct device_node *np = pdev->dev.of_node; |
| 2352 | struct net_device *dev; | 2352 | struct net_device *dev; |
| @@ -2584,7 +2584,7 @@ MODULE_DEVICE_TABLE(of, smsc911x_dt_ids); | |||
| 2584 | 2584 | ||
| 2585 | static struct platform_driver smsc911x_driver = { | 2585 | static struct platform_driver smsc911x_driver = { |
| 2586 | .probe = smsc911x_drv_probe, | 2586 | .probe = smsc911x_drv_probe, |
| 2587 | .remove = __devexit_p(smsc911x_drv_remove), | 2587 | .remove = smsc911x_drv_remove, |
| 2588 | .driver = { | 2588 | .driver = { |
| 2589 | .name = SMSC_CHIPNAME, | 2589 | .name = SMSC_CHIPNAME, |
| 2590 | .owner = THIS_MODULE, | 2590 | .owner = THIS_MODULE, |