aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:23:44 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:16:53 -0500
commit369158767af29ed54f3751f80222e751cf60236c (patch)
tree45db53014e06bcc5b4de5a469fa071032b22c469 /drivers/net
parentf57ae66ee5486426fc86ed46f97c5e15792c8535 (diff)
tlan: 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: Samuel Chessman <chessman@tux.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/ti/tlan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 3e6abf0f2771..af16081677e7 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -300,7 +300,7 @@ these functions are more or less common to all linux network drivers.
300 **************************************************************/ 300 **************************************************************/
301 301
302 302
303static void __devexit tlan_remove_one(struct pci_dev *pdev) 303static void tlan_remove_one(struct pci_dev *pdev)
304{ 304{
305 struct net_device *dev = pci_get_drvdata(pdev); 305 struct net_device *dev = pci_get_drvdata(pdev);
306 struct tlan_priv *priv = netdev_priv(dev); 306 struct tlan_priv *priv = netdev_priv(dev);
@@ -392,7 +392,7 @@ static struct pci_driver tlan_driver = {
392 .name = "tlan", 392 .name = "tlan",
393 .id_table = tlan_pci_tbl, 393 .id_table = tlan_pci_tbl,
394 .probe = tlan_init_one, 394 .probe = tlan_init_one,
395 .remove = __devexit_p(tlan_remove_one), 395 .remove = tlan_remove_one,
396 .suspend = tlan_suspend, 396 .suspend = tlan_suspend,
397 .resume = tlan_resume, 397 .resume = tlan_resume,
398}; 398};
@@ -434,7 +434,7 @@ err_out_pci_free:
434} 434}
435 435
436 436
437static int __devinit tlan_init_one(struct pci_dev *pdev, 437static int tlan_init_one(struct pci_dev *pdev,
438 const struct pci_device_id *ent) 438 const struct pci_device_id *ent)
439{ 439{
440 return tlan_probe1(pdev, -1, -1, 0, ent); 440 return tlan_probe1(pdev, -1, -1, 0, ent);
@@ -460,7 +460,7 @@ static int __devinit tlan_init_one(struct pci_dev *pdev,
460* 460*
461**************************************************************/ 461**************************************************************/
462 462
463static int __devinit tlan_probe1(struct pci_dev *pdev, 463static int tlan_probe1(struct pci_dev *pdev,
464 long ioaddr, int irq, int rev, 464 long ioaddr, int irq, int rev,
465 const struct pci_device_id *ent) 465 const struct pci_device_id *ent)
466{ 466{