提交 8489ec1f 编写于 作者: B Bill Pemberton 提交者: Greg Kroah-Hartman

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: NBill Pemberton <wfp5p@virginia.edu>
Cc: Steve Glendinning <steve.glendinning@shawell.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 1e48fea4
...@@ -1031,7 +1031,7 @@ static int smsc911x_mii_probe(struct net_device *dev) ...@@ -1031,7 +1031,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
return 0; return 0;
} }
static int __devinit smsc911x_mii_init(struct platform_device *pdev, static int smsc911x_mii_init(struct platform_device *pdev,
struct net_device *dev) struct net_device *dev)
{ {
struct smsc911x_data *pdata = netdev_priv(dev); struct smsc911x_data *pdata = netdev_priv(dev);
...@@ -2087,7 +2087,7 @@ static const struct net_device_ops smsc911x_netdev_ops = { ...@@ -2087,7 +2087,7 @@ static const struct net_device_ops smsc911x_netdev_ops = {
}; };
/* copies the current mac address from hardware to dev->dev_addr */ /* copies the current mac address from hardware to dev->dev_addr */
static void __devinit smsc911x_read_mac_address(struct net_device *dev) static void smsc911x_read_mac_address(struct net_device *dev)
{ {
struct smsc911x_data *pdata = netdev_priv(dev); struct smsc911x_data *pdata = netdev_priv(dev);
u32 mac_high16 = smsc911x_mac_read(pdata, ADDRH); u32 mac_high16 = smsc911x_mac_read(pdata, ADDRH);
...@@ -2102,7 +2102,7 @@ static void __devinit smsc911x_read_mac_address(struct net_device *dev) ...@@ -2102,7 +2102,7 @@ static void __devinit smsc911x_read_mac_address(struct net_device *dev)
} }
/* Initializing private device structures, only called from probe */ /* Initializing private device structures, only called from probe */
static int __devinit smsc911x_init(struct net_device *dev) static int smsc911x_init(struct net_device *dev)
{ {
struct smsc911x_data *pdata = netdev_priv(dev); struct smsc911x_data *pdata = netdev_priv(dev);
unsigned int byte_test, mask; unsigned int byte_test, mask;
...@@ -2239,7 +2239,7 @@ static int __devinit smsc911x_init(struct net_device *dev) ...@@ -2239,7 +2239,7 @@ static int __devinit smsc911x_init(struct net_device *dev)
return 0; return 0;
} }
static int __devexit smsc911x_drv_remove(struct platform_device *pdev) static int smsc911x_drv_remove(struct platform_device *pdev)
{ {
struct net_device *dev; struct net_device *dev;
struct smsc911x_data *pdata; struct smsc911x_data *pdata;
...@@ -2296,7 +2296,7 @@ static const struct smsc911x_ops shifted_smsc911x_ops = { ...@@ -2296,7 +2296,7 @@ static const struct smsc911x_ops shifted_smsc911x_ops = {
}; };
#ifdef CONFIG_OF #ifdef CONFIG_OF
static int __devinit smsc911x_probe_config_dt( static int smsc911x_probe_config_dt(
struct smsc911x_platform_config *config, struct smsc911x_platform_config *config,
struct device_node *np) struct device_node *np)
{ {
...@@ -2346,7 +2346,7 @@ static inline int smsc911x_probe_config_dt( ...@@ -2346,7 +2346,7 @@ static inline int smsc911x_probe_config_dt(
} }
#endif /* CONFIG_OF */ #endif /* CONFIG_OF */
static int __devinit smsc911x_drv_probe(struct platform_device *pdev) static int smsc911x_drv_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct net_device *dev; struct net_device *dev;
...@@ -2584,7 +2584,7 @@ MODULE_DEVICE_TABLE(of, smsc911x_dt_ids); ...@@ -2584,7 +2584,7 @@ MODULE_DEVICE_TABLE(of, smsc911x_dt_ids);
static struct platform_driver smsc911x_driver = { static struct platform_driver smsc911x_driver = {
.probe = smsc911x_drv_probe, .probe = smsc911x_drv_probe,
.remove = __devexit_p(smsc911x_drv_remove), .remove = smsc911x_drv_remove,
.driver = { .driver = {
.name = SMSC_CHIPNAME, .name = SMSC_CHIPNAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册