diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:23:05 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:16:42 -0500 |
commit | 854de92f6d3471e694ea807a52b2670862b15d42 (patch) | |
tree | 8850dd4079bd0213dbbdee51ab85e21b6a128b37 /drivers | |
parent | ff76a3cca3a2f8664e0625cb4d75601ff9ccde76 (diff) |
enic: 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: Christian Benvenuti <benve@cisco.com>
Cc: Roopa Prabhu <roprabhu@cisco.com>
Cc: Neel Patel <neepatel@cisco.com>
Cc: Nishank Trivedi <nistrive@cisco.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/ethernet/cisco/enic/enic_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index ad1468b3ab91..930f03bd1263 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c | |||
@@ -2275,7 +2275,7 @@ static void enic_iounmap(struct enic *enic) | |||
2275 | iounmap(enic->bar[i].vaddr); | 2275 | iounmap(enic->bar[i].vaddr); |
2276 | } | 2276 | } |
2277 | 2277 | ||
2278 | static int __devinit enic_probe(struct pci_dev *pdev, | 2278 | static int enic_probe(struct pci_dev *pdev, |
2279 | const struct pci_device_id *ent) | 2279 | const struct pci_device_id *ent) |
2280 | { | 2280 | { |
2281 | struct device *dev = &pdev->dev; | 2281 | struct device *dev = &pdev->dev; |
@@ -2552,7 +2552,7 @@ err_out_free_netdev: | |||
2552 | return err; | 2552 | return err; |
2553 | } | 2553 | } |
2554 | 2554 | ||
2555 | static void __devexit enic_remove(struct pci_dev *pdev) | 2555 | static void enic_remove(struct pci_dev *pdev) |
2556 | { | 2556 | { |
2557 | struct net_device *netdev = pci_get_drvdata(pdev); | 2557 | struct net_device *netdev = pci_get_drvdata(pdev); |
2558 | 2558 | ||
@@ -2584,7 +2584,7 @@ static struct pci_driver enic_driver = { | |||
2584 | .name = DRV_NAME, | 2584 | .name = DRV_NAME, |
2585 | .id_table = enic_id_table, | 2585 | .id_table = enic_id_table, |
2586 | .probe = enic_probe, | 2586 | .probe = enic_probe, |
2587 | .remove = __devexit_p(enic_remove), | 2587 | .remove = enic_remove, |
2588 | }; | 2588 | }; |
2589 | 2589 | ||
2590 | static int __init enic_init_module(void) | 2590 | static int __init enic_init_module(void) |