Skip to content

Commit

Permalink
smsc911x: remove __dev* attributes
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Dec 3, 2012
1 parent 1e48fea commit 8489ec1
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/net/ethernet/smsc/smsc911x.c
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ static int smsc911x_mii_probe(struct net_device *dev)
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 smsc911x_data *pdata = netdev_priv(dev);
Expand Down Expand Up @@ -2087,7 +2087,7 @@ static const struct net_device_ops smsc911x_netdev_ops = {
};

/* 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);
u32 mac_high16 = smsc911x_mac_read(pdata, ADDRH);
Expand All @@ -2102,7 +2102,7 @@ static void __devinit smsc911x_read_mac_address(struct net_device *dev)
}

/* 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);
unsigned int byte_test, mask;
Expand Down Expand Up @@ -2239,7 +2239,7 @@ static int __devinit smsc911x_init(struct net_device *dev)
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 smsc911x_data *pdata;
Expand Down Expand Up @@ -2296,7 +2296,7 @@ static const struct smsc911x_ops shifted_smsc911x_ops = {
};

#ifdef CONFIG_OF
static int __devinit smsc911x_probe_config_dt(
static int smsc911x_probe_config_dt(
struct smsc911x_platform_config *config,
struct device_node *np)
{
Expand Down Expand Up @@ -2346,7 +2346,7 @@ static inline int smsc911x_probe_config_dt(
}
#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 net_device *dev;
Expand Down Expand Up @@ -2584,7 +2584,7 @@ MODULE_DEVICE_TABLE(of, smsc911x_dt_ids);

static struct platform_driver smsc911x_driver = {
.probe = smsc911x_drv_probe,
.remove = __devexit_p(smsc911x_drv_remove),
.remove = smsc911x_drv_remove,
.driver = {
.name = SMSC_CHIPNAME,
.owner = THIS_MODULE,
Expand Down

0 comments on commit 8489ec1

Please sign in to comment.