diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-12-03 09:24:25 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-03 14:17:07 -0500 |
commit | 9f9a12f8ca79839c948464a37c5b557808278708 (patch) | |
tree | 133a5c18268d8154e3fdb753f1f4049293cdb0d1 /drivers/net/ethernet/intel/ixgb | |
parent | 0329aba13791ec256dacdfdc74eca8673f6dd2e8 (diff) |
net/intel: 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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Bruce Allan <bruce.w.allan@intel.com>
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Cc: Alex Duyck <alexander.h.duyck@intel.com>
Cc: John Ronciak <john.ronciak@intel.com>
Cc: Tushar Dave <tushar.n.dave@intel.com>
Cc: e1000-devel@lists.sourceforge.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/ethernet/intel/ixgb')
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_main.c | 10 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/ixgb/ixgb_param.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index d99a2d51b948..ae96c10251be 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -73,7 +73,7 @@ MODULE_DEVICE_TABLE(pci, ixgb_pci_tbl); | |||
73 | static int ixgb_init_module(void); | 73 | static int ixgb_init_module(void); |
74 | static void ixgb_exit_module(void); | 74 | static void ixgb_exit_module(void); |
75 | static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | 75 | static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
76 | static void __devexit ixgb_remove(struct pci_dev *pdev); | 76 | static void ixgb_remove(struct pci_dev *pdev); |
77 | static int ixgb_sw_init(struct ixgb_adapter *adapter); | 77 | static int ixgb_sw_init(struct ixgb_adapter *adapter); |
78 | static int ixgb_open(struct net_device *netdev); | 78 | static int ixgb_open(struct net_device *netdev); |
79 | static int ixgb_close(struct net_device *netdev); | 79 | static int ixgb_close(struct net_device *netdev); |
@@ -125,7 +125,7 @@ static struct pci_driver ixgb_driver = { | |||
125 | .name = ixgb_driver_name, | 125 | .name = ixgb_driver_name, |
126 | .id_table = ixgb_pci_tbl, | 126 | .id_table = ixgb_pci_tbl, |
127 | .probe = ixgb_probe, | 127 | .probe = ixgb_probe, |
128 | .remove = __devexit_p(ixgb_remove), | 128 | .remove = ixgb_remove, |
129 | .err_handler = &ixgb_err_handler | 129 | .err_handler = &ixgb_err_handler |
130 | }; | 130 | }; |
131 | 131 | ||
@@ -391,7 +391,7 @@ static const struct net_device_ops ixgb_netdev_ops = { | |||
391 | * and a hardware reset occur. | 391 | * and a hardware reset occur. |
392 | **/ | 392 | **/ |
393 | 393 | ||
394 | static int __devinit | 394 | static int |
395 | ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 395 | ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
396 | { | 396 | { |
397 | struct net_device *netdev = NULL; | 397 | struct net_device *netdev = NULL; |
@@ -558,7 +558,7 @@ err_dma_mask: | |||
558 | * memory. | 558 | * memory. |
559 | **/ | 559 | **/ |
560 | 560 | ||
561 | static void __devexit | 561 | static void |
562 | ixgb_remove(struct pci_dev *pdev) | 562 | ixgb_remove(struct pci_dev *pdev) |
563 | { | 563 | { |
564 | struct net_device *netdev = pci_get_drvdata(pdev); | 564 | struct net_device *netdev = pci_get_drvdata(pdev); |
@@ -584,7 +584,7 @@ ixgb_remove(struct pci_dev *pdev) | |||
584 | * OS network device settings (MTU size). | 584 | * OS network device settings (MTU size). |
585 | **/ | 585 | **/ |
586 | 586 | ||
587 | static int __devinit | 587 | static int |
588 | ixgb_sw_init(struct ixgb_adapter *adapter) | 588 | ixgb_sw_init(struct ixgb_adapter *adapter) |
589 | { | 589 | { |
590 | struct ixgb_hw *hw = &adapter->hw; | 590 | struct ixgb_hw *hw = &adapter->hw; |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_param.c b/drivers/net/ethernet/intel/ixgb/ixgb_param.c index 07d83ab46e21..04a60640ddda 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_param.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_param.c | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | #define IXGB_PARAM_INIT { [0 ... IXGB_MAX_NIC] = OPTION_UNSET } | 48 | #define IXGB_PARAM_INIT { [0 ... IXGB_MAX_NIC] = OPTION_UNSET } |
49 | #define IXGB_PARAM(X, desc) \ | 49 | #define IXGB_PARAM(X, desc) \ |
50 | static int __devinitdata X[IXGB_MAX_NIC+1] \ | 50 | static int X[IXGB_MAX_NIC+1] \ |
51 | = IXGB_PARAM_INIT; \ | 51 | = IXGB_PARAM_INIT; \ |
52 | static unsigned int num_##X = 0; \ | 52 | static unsigned int num_##X = 0; \ |
53 | module_param_array_named(X, X, int, &num_##X, 0); \ | 53 | module_param_array_named(X, X, int, &num_##X, 0); \ |
@@ -199,7 +199,7 @@ struct ixgb_option { | |||
199 | } arg; | 199 | } arg; |
200 | }; | 200 | }; |
201 | 201 | ||
202 | static int __devinit | 202 | static int |
203 | ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) | 203 | ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) |
204 | { | 204 | { |
205 | if (*value == OPTION_UNSET) { | 205 | if (*value == OPTION_UNSET) { |
@@ -257,7 +257,7 @@ ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) | |||
257 | * in a variable in the adapter structure. | 257 | * in a variable in the adapter structure. |
258 | **/ | 258 | **/ |
259 | 259 | ||
260 | void __devinit | 260 | void |
261 | ixgb_check_options(struct ixgb_adapter *adapter) | 261 | ixgb_check_options(struct ixgb_adapter *adapter) |
262 | { | 262 | { |
263 | int bd = adapter->bd_number; | 263 | int bd = adapter->bd_number; |