summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/micrel/ks8842.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 15:23:59 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 20:16:54 +0100
commit654b8c5ce3b32403a915dfd41d92ad3118c3406e (patch)
treec9759e128c3ef940290b0b6d1e1a2994ad50fff5 /drivers/net/ethernet/micrel/ks8842.c
parentnet/freescale: remove __dev* attributes (diff)
downloadlinux-654b8c5ce3b32403a915dfd41d92ad3118c3406e.tar.xz
linux-654b8c5ce3b32403a915dfd41d92ad3118c3406e.zip
net/micrel: 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/net/ethernet/micrel/ks8842.c')
-rw-r--r--drivers/net/ethernet/micrel/ks8842.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 24fb049ac2f2..b71eb39ab448 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -1141,7 +1141,7 @@ static const struct ethtool_ops ks8842_ethtool_ops = {
.get_link = ethtool_op_get_link,
};
-static int __devinit ks8842_probe(struct platform_device *pdev)
+static int ks8842_probe(struct platform_device *pdev)
{
int err = -ENOMEM;
struct resource *iomem;
@@ -1240,7 +1240,7 @@ err_mem_region:
return err;
}
-static int __devexit ks8842_remove(struct platform_device *pdev)
+static int ks8842_remove(struct platform_device *pdev)
{
struct net_device *netdev = platform_get_drvdata(pdev);
struct ks8842_adapter *adapter = netdev_priv(netdev);
@@ -1262,7 +1262,7 @@ static struct platform_driver ks8842_platform_driver = {
.owner = THIS_MODULE,
},
.probe = ks8842_probe,
- .remove = __devexit_p(ks8842_remove),
+ .remove = ks8842_remove,
};
module_platform_driver(ks8842_platform_driver);