aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-12-03 09:24:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-03 14:17:07 -0500
commit9f9a12f8ca79839c948464a37c5b557808278708 (patch)
tree133a5c18268d8154e3fdb753f1f4049293cdb0d1
parent0329aba13791ec256dacdfdc74eca8673f6dd2e8 (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>
-rw-r--r--drivers/net/ethernet/intel/e100.c6
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c12
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_param.c10
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c10
-rw-r--r--drivers/net/ethernet/intel/e1000e/param.c6
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c12
-rw-r--r--drivers/net/ethernet/intel/igbvf/netdev.c10
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_main.c10
-rw-r--r--drivers/net/ethernet/intel/ixgb/ixgb_param.c6
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c8
-rw-r--r--drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c8
11 files changed, 49 insertions, 49 deletions
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index 29ce9bd27f94..50c205098626 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2829,7 +2829,7 @@ static const struct net_device_ops e100_netdev_ops = {
2829 .ndo_set_features = e100_set_features, 2829 .ndo_set_features = e100_set_features,
2830}; 2830};
2831 2831
2832static int __devinit e100_probe(struct pci_dev *pdev, 2832static int e100_probe(struct pci_dev *pdev,
2833 const struct pci_device_id *ent) 2833 const struct pci_device_id *ent)
2834{ 2834{
2835 struct net_device *netdev; 2835 struct net_device *netdev;
@@ -2981,7 +2981,7 @@ err_out_free_dev:
2981 return err; 2981 return err;
2982} 2982}
2983 2983
2984static void __devexit e100_remove(struct pci_dev *pdev) 2984static void e100_remove(struct pci_dev *pdev)
2985{ 2985{
2986 struct net_device *netdev = pci_get_drvdata(pdev); 2986 struct net_device *netdev = pci_get_drvdata(pdev);
2987 2987
@@ -3167,7 +3167,7 @@ static struct pci_driver e100_driver = {
3167 .name = DRV_NAME, 3167 .name = DRV_NAME,
3168 .id_table = e100_id_table, 3168 .id_table = e100_id_table,
3169 .probe = e100_probe, 3169 .probe = e100_probe,
3170 .remove = __devexit_p(e100_remove), 3170 .remove = e100_remove,
3171#ifdef CONFIG_PM 3171#ifdef CONFIG_PM
3172 /* Power Management hooks */ 3172 /* Power Management hooks */
3173 .suspend = e100_suspend, 3173 .suspend = e100_suspend,
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 222bfaff4622..840fb0d39034 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -111,7 +111,7 @@ void e1000_update_stats(struct e1000_adapter *adapter);
111static int e1000_init_module(void); 111static int e1000_init_module(void);
112static void e1000_exit_module(void); 112static void e1000_exit_module(void);
113static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 113static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
114static void __devexit e1000_remove(struct pci_dev *pdev); 114static void e1000_remove(struct pci_dev *pdev);
115static int e1000_alloc_queues(struct e1000_adapter *adapter); 115static int e1000_alloc_queues(struct e1000_adapter *adapter);
116static int e1000_sw_init(struct e1000_adapter *adapter); 116static int e1000_sw_init(struct e1000_adapter *adapter);
117static int e1000_open(struct net_device *netdev); 117static int e1000_open(struct net_device *netdev);
@@ -202,7 +202,7 @@ static struct pci_driver e1000_driver = {
202 .name = e1000_driver_name, 202 .name = e1000_driver_name,
203 .id_table = e1000_pci_tbl, 203 .id_table = e1000_pci_tbl,
204 .probe = e1000_probe, 204 .probe = e1000_probe,
205 .remove = __devexit_p(e1000_remove), 205 .remove = e1000_remove,
206#ifdef CONFIG_PM 206#ifdef CONFIG_PM
207 /* Power Management Hooks */ 207 /* Power Management Hooks */
208 .suspend = e1000_suspend, 208 .suspend = e1000_suspend,
@@ -938,7 +938,7 @@ static int e1000_init_hw_struct(struct e1000_adapter *adapter,
938 * The OS initialization, configuring of the adapter private structure, 938 * The OS initialization, configuring of the adapter private structure,
939 * and a hardware reset occur. 939 * and a hardware reset occur.
940 **/ 940 **/
941static int __devinit e1000_probe(struct pci_dev *pdev, 941static int e1000_probe(struct pci_dev *pdev,
942 const struct pci_device_id *ent) 942 const struct pci_device_id *ent)
943{ 943{
944 struct net_device *netdev; 944 struct net_device *netdev;
@@ -1273,7 +1273,7 @@ err_pci_reg:
1273 * memory. 1273 * memory.
1274 **/ 1274 **/
1275 1275
1276static void __devexit e1000_remove(struct pci_dev *pdev) 1276static void e1000_remove(struct pci_dev *pdev)
1277{ 1277{
1278 struct net_device *netdev = pci_get_drvdata(pdev); 1278 struct net_device *netdev = pci_get_drvdata(pdev);
1279 struct e1000_adapter *adapter = netdev_priv(netdev); 1279 struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -1309,7 +1309,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev)
1309 * e1000_init_hw_struct MUST be called before this function 1309 * e1000_init_hw_struct MUST be called before this function
1310 **/ 1310 **/
1311 1311
1312static int __devinit e1000_sw_init(struct e1000_adapter *adapter) 1312static int e1000_sw_init(struct e1000_adapter *adapter)
1313{ 1313{
1314 adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE; 1314 adapter->rx_buffer_len = MAXIMUM_ETHERNET_VLAN_SIZE;
1315 1315
@@ -1340,7 +1340,7 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)
1340 * number of queues at compile-time. 1340 * number of queues at compile-time.
1341 **/ 1341 **/
1342 1342
1343static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter) 1343static int e1000_alloc_queues(struct e1000_adapter *adapter)
1344{ 1344{
1345 adapter->tx_ring = kcalloc(adapter->num_tx_queues, 1345 adapter->tx_ring = kcalloc(adapter->num_tx_queues,
1346 sizeof(struct e1000_tx_ring), GFP_KERNEL); 1346 sizeof(struct e1000_tx_ring), GFP_KERNEL);
diff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
index 1301eba8b57a..4e19aa0657f4 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_param.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c
@@ -45,7 +45,7 @@
45 45
46#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET } 46#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
47#define E1000_PARAM(X, desc) \ 47#define E1000_PARAM(X, desc) \
48 static int __devinitdata X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \ 48 static int X[E1000_MAX_NIC+1] = E1000_PARAM_INIT; \
49 static unsigned int num_##X; \ 49 static unsigned int num_##X; \
50 module_param_array_named(X, X, int, &num_##X, 0); \ 50 module_param_array_named(X, X, int, &num_##X, 0); \
51 MODULE_PARM_DESC(X, desc); 51 MODULE_PARM_DESC(X, desc);
@@ -205,7 +205,7 @@ struct e1000_option {
205 } arg; 205 } arg;
206}; 206};
207 207
208static int __devinit e1000_validate_option(unsigned int *value, 208static int e1000_validate_option(unsigned int *value,
209 const struct e1000_option *opt, 209 const struct e1000_option *opt,
210 struct e1000_adapter *adapter) 210 struct e1000_adapter *adapter)
211{ 211{
@@ -268,7 +268,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter);
268 * in a variable in the adapter structure. 268 * in a variable in the adapter structure.
269 **/ 269 **/
270 270
271void __devinit e1000_check_options(struct e1000_adapter *adapter) 271void e1000_check_options(struct e1000_adapter *adapter)
272{ 272{
273 struct e1000_option opt; 273 struct e1000_option opt;
274 int bd = adapter->bd_number; 274 int bd = adapter->bd_number;
@@ -534,7 +534,7 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
534 * Handles speed and duplex options on fiber adapters 534 * Handles speed and duplex options on fiber adapters
535 **/ 535 **/
536 536
537static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter) 537static void e1000_check_fiber_options(struct e1000_adapter *adapter)
538{ 538{
539 int bd = adapter->bd_number; 539 int bd = adapter->bd_number;
540 if (num_Speed > bd) { 540 if (num_Speed > bd) {
@@ -560,7 +560,7 @@ static void __devinit e1000_check_fiber_options(struct e1000_adapter *adapter)
560 * Handles speed and duplex options on copper adapters 560 * Handles speed and duplex options on copper adapters
561 **/ 561 **/
562 562
563static void __devinit e1000_check_copper_options(struct e1000_adapter *adapter) 563static void e1000_check_copper_options(struct e1000_adapter *adapter)
564{ 564{
565 struct e1000_option opt; 565 struct e1000_option opt;
566 unsigned int speed, dplx, an; 566 unsigned int speed, dplx, an;
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 6d06ed4e34b1..829e81471ae7 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -2503,7 +2503,7 @@ void e1000e_write_itr(struct e1000_adapter *adapter, u32 itr)
2503 * e1000_alloc_queues - Allocate memory for all rings 2503 * e1000_alloc_queues - Allocate memory for all rings
2504 * @adapter: board private structure to initialize 2504 * @adapter: board private structure to initialize
2505 **/ 2505 **/
2506static int __devinit e1000_alloc_queues(struct e1000_adapter *adapter) 2506static int e1000_alloc_queues(struct e1000_adapter *adapter)
2507{ 2507{
2508 int size = sizeof(struct e1000_ring); 2508 int size = sizeof(struct e1000_ring);
2509 2509
@@ -3676,7 +3676,7 @@ void e1000e_reinit_locked(struct e1000_adapter *adapter)
3676 * Fields are initialized based on PCI device information and 3676 * Fields are initialized based on PCI device information and
3677 * OS network device settings (MTU size). 3677 * OS network device settings (MTU size).
3678 **/ 3678 **/
3679static int __devinit e1000_sw_init(struct e1000_adapter *adapter) 3679static int e1000_sw_init(struct e1000_adapter *adapter)
3680{ 3680{
3681 struct net_device *netdev = adapter->netdev; 3681 struct net_device *netdev = adapter->netdev;
3682 3682
@@ -6024,7 +6024,7 @@ static const struct net_device_ops e1000e_netdev_ops = {
6024 * The OS initialization, configuring of the adapter private structure, 6024 * The OS initialization, configuring of the adapter private structure,
6025 * and a hardware reset occur. 6025 * and a hardware reset occur.
6026 **/ 6026 **/
6027static int __devinit e1000_probe(struct pci_dev *pdev, 6027static int e1000_probe(struct pci_dev *pdev,
6028 const struct pci_device_id *ent) 6028 const struct pci_device_id *ent)
6029{ 6029{
6030 struct net_device *netdev; 6030 struct net_device *netdev;
@@ -6361,7 +6361,7 @@ err_dma:
6361 * Hot-Plug event, or because the driver is going to be removed from 6361 * Hot-Plug event, or because the driver is going to be removed from
6362 * memory. 6362 * memory.
6363 **/ 6363 **/
6364static void __devexit e1000_remove(struct pci_dev *pdev) 6364static void e1000_remove(struct pci_dev *pdev)
6365{ 6365{
6366 struct net_device *netdev = pci_get_drvdata(pdev); 6366 struct net_device *netdev = pci_get_drvdata(pdev);
6367 struct e1000_adapter *adapter = netdev_priv(netdev); 6367 struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -6512,7 +6512,7 @@ static struct pci_driver e1000_driver = {
6512 .name = e1000e_driver_name, 6512 .name = e1000e_driver_name,
6513 .id_table = e1000_pci_tbl, 6513 .id_table = e1000_pci_tbl,
6514 .probe = e1000_probe, 6514 .probe = e1000_probe,
6515 .remove = __devexit_p(e1000_remove), 6515 .remove = e1000_remove,
6516#ifdef CONFIG_PM 6516#ifdef CONFIG_PM
6517 .driver = { 6517 .driver = {
6518 .pm = &e1000_pm_ops, 6518 .pm = &e1000_pm_ops,
diff --git a/drivers/net/ethernet/intel/e1000e/param.c b/drivers/net/ethernet/intel/e1000e/param.c
index 1fbb31554e4d..b3beed2232fd 100644
--- a/drivers/net/ethernet/intel/e1000e/param.c
+++ b/drivers/net/ethernet/intel/e1000e/param.c
@@ -53,7 +53,7 @@ MODULE_PARM_DESC(copybreak,
53 */ 53 */
54#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET } 54#define E1000_PARAM_INIT { [0 ... E1000_MAX_NIC] = OPTION_UNSET }
55#define E1000_PARAM(X, desc) \ 55#define E1000_PARAM(X, desc) \
56 static int __devinitdata X[E1000_MAX_NIC+1] \ 56 static int X[E1000_MAX_NIC+1] \
57 = E1000_PARAM_INIT; \ 57 = E1000_PARAM_INIT; \
58 static unsigned int num_##X; \ 58 static unsigned int num_##X; \
59 module_param_array_named(X, X, int, &num_##X, 0); \ 59 module_param_array_named(X, X, int, &num_##X, 0); \
@@ -172,7 +172,7 @@ struct e1000_option {
172 } arg; 172 } arg;
173}; 173};
174 174
175static int __devinit e1000_validate_option(unsigned int *value, 175static int e1000_validate_option(unsigned int *value,
176 const struct e1000_option *opt, 176 const struct e1000_option *opt,
177 struct e1000_adapter *adapter) 177 struct e1000_adapter *adapter)
178{ 178{
@@ -235,7 +235,7 @@ static int __devinit e1000_validate_option(unsigned int *value,
235 * value exists, a default value is used. The final value is stored 235 * value exists, a default value is used. The final value is stored
236 * in a variable in the adapter structure. 236 * in a variable in the adapter structure.
237 **/ 237 **/
238void __devinit e1000e_check_options(struct e1000_adapter *adapter) 238void e1000e_check_options(struct e1000_adapter *adapter)
239{ 239{
240 struct e1000_hw *hw = &adapter->hw; 240 struct e1000_hw *hw = &adapter->hw;
241 int bd = adapter->bd_number; 241 int bd = adapter->bd_number;
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index b85b15a88981..de4ebb306530 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -118,7 +118,7 @@ static void igb_free_all_tx_resources(struct igb_adapter *);
118static void igb_free_all_rx_resources(struct igb_adapter *); 118static void igb_free_all_rx_resources(struct igb_adapter *);
119static void igb_setup_mrqc(struct igb_adapter *); 119static void igb_setup_mrqc(struct igb_adapter *);
120static int igb_probe(struct pci_dev *, const struct pci_device_id *); 120static int igb_probe(struct pci_dev *, const struct pci_device_id *);
121static void __devexit igb_remove(struct pci_dev *pdev); 121static void igb_remove(struct pci_dev *pdev);
122static int igb_sw_init(struct igb_adapter *); 122static int igb_sw_init(struct igb_adapter *);
123static int igb_open(struct net_device *); 123static int igb_open(struct net_device *);
124static int igb_close(struct net_device *); 124static int igb_close(struct net_device *);
@@ -228,7 +228,7 @@ static struct pci_driver igb_driver = {
228 .name = igb_driver_name, 228 .name = igb_driver_name,
229 .id_table = igb_pci_tbl, 229 .id_table = igb_pci_tbl,
230 .probe = igb_probe, 230 .probe = igb_probe,
231 .remove = __devexit_p(igb_remove), 231 .remove = igb_remove,
232#ifdef CONFIG_PM 232#ifdef CONFIG_PM
233 .driver.pm = &igb_pm_ops, 233 .driver.pm = &igb_pm_ops,
234#endif 234#endif
@@ -1824,7 +1824,7 @@ void igb_set_fw_version(struct igb_adapter *adapter)
1824 * The OS initialization, configuring of the adapter private structure, 1824 * The OS initialization, configuring of the adapter private structure,
1825 * and a hardware reset occur. 1825 * and a hardware reset occur.
1826 **/ 1826 **/
1827static int __devinit igb_probe(struct pci_dev *pdev, 1827static int igb_probe(struct pci_dev *pdev,
1828 const struct pci_device_id *ent) 1828 const struct pci_device_id *ent)
1829{ 1829{
1830 struct net_device *netdev; 1830 struct net_device *netdev;
@@ -2197,7 +2197,7 @@ err_dma:
2197 * Hot-Plug event, or because the driver is going to be removed from 2197 * Hot-Plug event, or because the driver is going to be removed from
2198 * memory. 2198 * memory.
2199 **/ 2199 **/
2200static void __devexit igb_remove(struct pci_dev *pdev) 2200static void igb_remove(struct pci_dev *pdev)
2201{ 2201{
2202 struct net_device *netdev = pci_get_drvdata(pdev); 2202 struct net_device *netdev = pci_get_drvdata(pdev);
2203 struct igb_adapter *adapter = netdev_priv(netdev); 2203 struct igb_adapter *adapter = netdev_priv(netdev);
@@ -2277,7 +2277,7 @@ static void __devexit igb_remove(struct pci_dev *pdev)
2277 * mor expensive time wise to disable SR-IOV than it is to allocate and free 2277 * mor expensive time wise to disable SR-IOV than it is to allocate and free
2278 * the memory for the VFs. 2278 * the memory for the VFs.
2279 **/ 2279 **/
2280static void __devinit igb_probe_vfs(struct igb_adapter * adapter) 2280static void igb_probe_vfs(struct igb_adapter *adapter)
2281{ 2281{
2282#ifdef CONFIG_PCI_IOV 2282#ifdef CONFIG_PCI_IOV
2283 struct pci_dev *pdev = adapter->pdev; 2283 struct pci_dev *pdev = adapter->pdev;
@@ -2338,7 +2338,7 @@ out:
2338 * Fields are initialized based on PCI device information and 2338 * Fields are initialized based on PCI device information and
2339 * OS network device settings (MTU size). 2339 * OS network device settings (MTU size).
2340 **/ 2340 **/
2341static int __devinit igb_sw_init(struct igb_adapter *adapter) 2341static int igb_sw_init(struct igb_adapter *adapter)
2342{ 2342{
2343 struct e1000_hw *hw = &adapter->hw; 2343 struct e1000_hw *hw = &adapter->hw;
2344 struct net_device *netdev = adapter->netdev; 2344 struct net_device *netdev = adapter->netdev;
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c
index 3d92ad8cdca1..b494309ee942 100644
--- a/drivers/net/ethernet/intel/igbvf/netdev.c
+++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1098,7 +1098,7 @@ out:
1098 * igbvf_alloc_queues - Allocate memory for all rings 1098 * igbvf_alloc_queues - Allocate memory for all rings
1099 * @adapter: board private structure to initialize 1099 * @adapter: board private structure to initialize
1100 **/ 1100 **/
1101static int __devinit igbvf_alloc_queues(struct igbvf_adapter *adapter) 1101static int igbvf_alloc_queues(struct igbvf_adapter *adapter)
1102{ 1102{
1103 struct net_device *netdev = adapter->netdev; 1103 struct net_device *netdev = adapter->netdev;
1104 1104
@@ -1550,7 +1550,7 @@ void igbvf_reinit_locked(struct igbvf_adapter *adapter)
1550 * Fields are initialized based on PCI device information and 1550 * Fields are initialized based on PCI device information and
1551 * OS network device settings (MTU size). 1551 * OS network device settings (MTU size).
1552 **/ 1552 **/
1553static int __devinit igbvf_sw_init(struct igbvf_adapter *adapter) 1553static int igbvf_sw_init(struct igbvf_adapter *adapter)
1554{ 1554{
1555 struct net_device *netdev = adapter->netdev; 1555 struct net_device *netdev = adapter->netdev;
1556 s32 rc; 1556 s32 rc;
@@ -2618,7 +2618,7 @@ static const struct net_device_ops igbvf_netdev_ops = {
2618 * The OS initialization, configuring of the adapter private structure, 2618 * The OS initialization, configuring of the adapter private structure,
2619 * and a hardware reset occur. 2619 * and a hardware reset occur.
2620 **/ 2620 **/
2621static int __devinit igbvf_probe(struct pci_dev *pdev, 2621static int igbvf_probe(struct pci_dev *pdev,
2622 const struct pci_device_id *ent) 2622 const struct pci_device_id *ent)
2623{ 2623{
2624 struct net_device *netdev; 2624 struct net_device *netdev;
@@ -2818,7 +2818,7 @@ err_dma:
2818 * Hot-Plug event, or because the driver is going to be removed from 2818 * Hot-Plug event, or because the driver is going to be removed from
2819 * memory. 2819 * memory.
2820 **/ 2820 **/
2821static void __devexit igbvf_remove(struct pci_dev *pdev) 2821static void igbvf_remove(struct pci_dev *pdev)
2822{ 2822{
2823 struct net_device *netdev = pci_get_drvdata(pdev); 2823 struct net_device *netdev = pci_get_drvdata(pdev);
2824 struct igbvf_adapter *adapter = netdev_priv(netdev); 2824 struct igbvf_adapter *adapter = netdev_priv(netdev);
@@ -2875,7 +2875,7 @@ static struct pci_driver igbvf_driver = {
2875 .name = igbvf_driver_name, 2875 .name = igbvf_driver_name,
2876 .id_table = igbvf_pci_tbl, 2876 .id_table = igbvf_pci_tbl,
2877 .probe = igbvf_probe, 2877 .probe = igbvf_probe,
2878 .remove = __devexit_p(igbvf_remove), 2878 .remove = igbvf_remove,
2879#ifdef CONFIG_PM 2879#ifdef CONFIG_PM
2880 /* Power Management Hooks */ 2880 /* Power Management Hooks */
2881 .suspend = igbvf_suspend, 2881 .suspend = igbvf_suspend,
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);
73static int ixgb_init_module(void); 73static int ixgb_init_module(void);
74static void ixgb_exit_module(void); 74static void ixgb_exit_module(void);
75static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); 75static int ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
76static void __devexit ixgb_remove(struct pci_dev *pdev); 76static void ixgb_remove(struct pci_dev *pdev);
77static int ixgb_sw_init(struct ixgb_adapter *adapter); 77static int ixgb_sw_init(struct ixgb_adapter *adapter);
78static int ixgb_open(struct net_device *netdev); 78static int ixgb_open(struct net_device *netdev);
79static int ixgb_close(struct net_device *netdev); 79static 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
394static int __devinit 394static int
395ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 395ixgb_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
561static void __devexit 561static void
562ixgb_remove(struct pci_dev *pdev) 562ixgb_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
587static int __devinit 587static int
588ixgb_sw_init(struct ixgb_adapter *adapter) 588ixgb_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
202static int __devinit 202static int
203ixgb_validate_option(unsigned int *value, const struct ixgb_option *opt) 203ixgb_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
260void __devinit 260void
261ixgb_check_options(struct ixgb_adapter *adapter) 261ixgb_check_options(struct ixgb_adapter *adapter)
262{ 262{
263 int bd = adapter->bd_number; 263 int bd = adapter->bd_number;
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 79b834583188..2fa16de46786 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -4462,7 +4462,7 @@ static void ixgbe_tx_timeout(struct net_device *netdev)
4462 * Fields are initialized based on PCI device information and 4462 * Fields are initialized based on PCI device information and
4463 * OS network device settings (MTU size). 4463 * OS network device settings (MTU size).
4464 **/ 4464 **/
4465static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter) 4465static int ixgbe_sw_init(struct ixgbe_adapter *adapter)
4466{ 4466{
4467 struct ixgbe_hw *hw = &adapter->hw; 4467 struct ixgbe_hw *hw = &adapter->hw;
4468 struct pci_dev *pdev = adapter->pdev; 4468 struct pci_dev *pdev = adapter->pdev;
@@ -7183,7 +7183,7 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id,
7183 * The OS initialization, configuring of the adapter private structure, 7183 * The OS initialization, configuring of the adapter private structure,
7184 * and a hardware reset occur. 7184 * and a hardware reset occur.
7185 **/ 7185 **/
7186static int __devinit ixgbe_probe(struct pci_dev *pdev, 7186static int ixgbe_probe(struct pci_dev *pdev,
7187 const struct pci_device_id *ent) 7187 const struct pci_device_id *ent)
7188{ 7188{
7189 struct net_device *netdev; 7189 struct net_device *netdev;
@@ -7590,7 +7590,7 @@ err_dma:
7590 * Hot-Plug event, or because the driver is going to be removed from 7590 * Hot-Plug event, or because the driver is going to be removed from
7591 * memory. 7591 * memory.
7592 **/ 7592 **/
7593static void __devexit ixgbe_remove(struct pci_dev *pdev) 7593static void ixgbe_remove(struct pci_dev *pdev)
7594{ 7594{
7595 struct ixgbe_adapter *adapter = pci_get_drvdata(pdev); 7595 struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
7596 struct net_device *netdev = adapter->netdev; 7596 struct net_device *netdev = adapter->netdev;
@@ -7830,7 +7830,7 @@ static struct pci_driver ixgbe_driver = {
7830 .name = ixgbe_driver_name, 7830 .name = ixgbe_driver_name,
7831 .id_table = ixgbe_pci_tbl, 7831 .id_table = ixgbe_pci_tbl,
7832 .probe = ixgbe_probe, 7832 .probe = ixgbe_probe,
7833 .remove = __devexit_p(ixgbe_remove), 7833 .remove = ixgbe_remove,
7834#ifdef CONFIG_PM 7834#ifdef CONFIG_PM
7835 .suspend = ixgbe_suspend, 7835 .suspend = ixgbe_suspend,
7836 .resume = ixgbe_resume, 7836 .resume = ixgbe_resume,
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
index f267c003a1bc..1e2f02ac268d 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
@@ -2009,7 +2009,7 @@ static void ixgbevf_clear_interrupt_scheme(struct ixgbevf_adapter *adapter)
2009 * Fields are initialized based on PCI device information and 2009 * Fields are initialized based on PCI device information and
2010 * OS network device settings (MTU size). 2010 * OS network device settings (MTU size).
2011 **/ 2011 **/
2012static int __devinit ixgbevf_sw_init(struct ixgbevf_adapter *adapter) 2012static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter)
2013{ 2013{
2014 struct ixgbe_hw *hw = &adapter->hw; 2014 struct ixgbe_hw *hw = &adapter->hw;
2015 struct pci_dev *pdev = adapter->pdev; 2015 struct pci_dev *pdev = adapter->pdev;
@@ -3242,7 +3242,7 @@ static void ixgbevf_assign_netdev_ops(struct net_device *dev)
3242 * The OS initialization, configuring of the adapter private structure, 3242 * The OS initialization, configuring of the adapter private structure,
3243 * and a hardware reset occur. 3243 * and a hardware reset occur.
3244 **/ 3244 **/
3245static int __devinit ixgbevf_probe(struct pci_dev *pdev, 3245static int ixgbevf_probe(struct pci_dev *pdev,
3246 const struct pci_device_id *ent) 3246 const struct pci_device_id *ent)
3247{ 3247{
3248 struct net_device *netdev; 3248 struct net_device *netdev;
@@ -3414,7 +3414,7 @@ err_dma:
3414 * Hot-Plug event, or because the driver is going to be removed from 3414 * Hot-Plug event, or because the driver is going to be removed from
3415 * memory. 3415 * memory.
3416 **/ 3416 **/
3417static void __devexit ixgbevf_remove(struct pci_dev *pdev) 3417static void ixgbevf_remove(struct pci_dev *pdev)
3418{ 3418{
3419 struct net_device *netdev = pci_get_drvdata(pdev); 3419 struct net_device *netdev = pci_get_drvdata(pdev);
3420 struct ixgbevf_adapter *adapter = netdev_priv(netdev); 3420 struct ixgbevf_adapter *adapter = netdev_priv(netdev);
@@ -3528,7 +3528,7 @@ static struct pci_driver ixgbevf_driver = {
3528 .name = ixgbevf_driver_name, 3528 .name = ixgbevf_driver_name,
3529 .id_table = ixgbevf_pci_tbl, 3529 .id_table = ixgbevf_pci_tbl,
3530 .probe = ixgbevf_probe, 3530 .probe = ixgbevf_probe,
3531 .remove = __devexit_p(ixgbevf_remove), 3531 .remove = ixgbevf_remove,
3532#ifdef CONFIG_PM 3532#ifdef CONFIG_PM
3533 /* Power Management Hooks */ 3533 /* Power Management Hooks */
3534 .suspend = ixgbevf_suspend, 3534 .suspend = ixgbevf_suspend,