diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2012-09-07 12:33:15 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-07 18:35:00 -0400 |
commit | 3646f0e5c97703cecfd96cdabb085e78d9b7f680 (patch) | |
tree | 93a7673401fcb092f0fd0d6e65a7572f2a4b60c2 | |
parent | 494530284f16298050ab99f54b7b12dd7d1418a1 (diff) |
netdev: make pci_error_handlers const
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
23 files changed, 23 insertions, 23 deletions
diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c index 1bf5bbfe778e..64c8c2eb05b5 100644 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c | |||
@@ -2685,7 +2685,7 @@ static void atl1c_io_resume(struct pci_dev *pdev) | |||
2685 | netif_device_attach(netdev); | 2685 | netif_device_attach(netdev); |
2686 | } | 2686 | } |
2687 | 2687 | ||
2688 | static struct pci_error_handlers atl1c_err_handler = { | 2688 | static const struct pci_error_handlers atl1c_err_handler = { |
2689 | .error_detected = atl1c_io_error_detected, | 2689 | .error_detected = atl1c_io_error_detected, |
2690 | .slot_reset = atl1c_io_slot_reset, | 2690 | .slot_reset = atl1c_io_slot_reset, |
2691 | .resume = atl1c_io_resume, | 2691 | .resume = atl1c_io_resume, |
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index a98acc8a956f..e213da29e73d 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c | |||
@@ -2489,7 +2489,7 @@ static void atl1e_io_resume(struct pci_dev *pdev) | |||
2489 | netif_device_attach(netdev); | 2489 | netif_device_attach(netdev); |
2490 | } | 2490 | } |
2491 | 2491 | ||
2492 | static struct pci_error_handlers atl1e_err_handler = { | 2492 | static const struct pci_error_handlers atl1e_err_handler = { |
2493 | .error_detected = atl1e_io_error_detected, | 2493 | .error_detected = atl1e_io_error_detected, |
2494 | .slot_reset = atl1e_io_slot_reset, | 2494 | .slot_reset = atl1e_io_slot_reset, |
2495 | .resume = atl1e_io_resume, | 2495 | .resume = atl1e_io_resume, |
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index 79cebd8525ce..a0e8399793b6 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -8742,7 +8742,7 @@ static void bnx2_io_resume(struct pci_dev *pdev) | |||
8742 | rtnl_unlock(); | 8742 | rtnl_unlock(); |
8743 | } | 8743 | } |
8744 | 8744 | ||
8745 | static struct pci_error_handlers bnx2_err_handler = { | 8745 | static const struct pci_error_handlers bnx2_err_handler = { |
8746 | .error_detected = bnx2_io_error_detected, | 8746 | .error_detected = bnx2_io_error_detected, |
8747 | .slot_reset = bnx2_io_slot_reset, | 8747 | .slot_reset = bnx2_io_slot_reset, |
8748 | .resume = bnx2_io_resume, | 8748 | .resume = bnx2_io_resume, |
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index dd451c3dd83d..81e377408a4e 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | |||
@@ -12171,7 +12171,7 @@ static void bnx2x_io_resume(struct pci_dev *pdev) | |||
12171 | rtnl_unlock(); | 12171 | rtnl_unlock(); |
12172 | } | 12172 | } |
12173 | 12173 | ||
12174 | static struct pci_error_handlers bnx2x_err_handler = { | 12174 | static const struct pci_error_handlers bnx2x_err_handler = { |
12175 | .error_detected = bnx2x_io_error_detected, | 12175 | .error_detected = bnx2x_io_error_detected, |
12176 | .slot_reset = bnx2x_io_slot_reset, | 12176 | .slot_reset = bnx2x_io_slot_reset, |
12177 | .resume = bnx2x_io_resume, | 12177 | .resume = bnx2x_io_resume, |
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index bf906c51d82a..5639b5c85c54 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c | |||
@@ -16397,7 +16397,7 @@ done: | |||
16397 | rtnl_unlock(); | 16397 | rtnl_unlock(); |
16398 | } | 16398 | } |
16399 | 16399 | ||
16400 | static struct pci_error_handlers tg3_err_handler = { | 16400 | static const struct pci_error_handlers tg3_err_handler = { |
16401 | .error_detected = tg3_io_error_detected, | 16401 | .error_detected = tg3_io_error_detected, |
16402 | .slot_reset = tg3_io_slot_reset, | 16402 | .slot_reset = tg3_io_slot_reset, |
16403 | .resume = tg3_io_resume | 16403 | .resume = tg3_io_resume |
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index 6505070abcfa..875bbb999aa2 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | |||
@@ -3036,7 +3036,7 @@ static void t3_io_resume(struct pci_dev *pdev) | |||
3036 | t3_resume_ports(adapter); | 3036 | t3_resume_ports(adapter); |
3037 | } | 3037 | } |
3038 | 3038 | ||
3039 | static struct pci_error_handlers t3_err_handler = { | 3039 | static const struct pci_error_handlers t3_err_handler = { |
3040 | .error_detected = t3_io_error_detected, | 3040 | .error_detected = t3_io_error_detected, |
3041 | .slot_reset = t3_io_slot_reset, | 3041 | .slot_reset = t3_io_slot_reset, |
3042 | .resume = t3_io_resume, | 3042 | .resume = t3_io_resume, |
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 5ed49af23d6a..05bdbbbf145c 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | |||
@@ -3453,7 +3453,7 @@ static void eeh_resume(struct pci_dev *pdev) | |||
3453 | rtnl_unlock(); | 3453 | rtnl_unlock(); |
3454 | } | 3454 | } |
3455 | 3455 | ||
3456 | static struct pci_error_handlers cxgb4_eeh = { | 3456 | static const struct pci_error_handlers cxgb4_eeh = { |
3457 | .error_detected = eeh_err_detected, | 3457 | .error_detected = eeh_err_detected, |
3458 | .slot_reset = eeh_slot_reset, | 3458 | .slot_reset = eeh_slot_reset, |
3459 | .resume = eeh_resume, | 3459 | .resume = eeh_resume, |
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index c60de89b6669..a00295528281 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
@@ -4104,7 +4104,7 @@ err: | |||
4104 | dev_err(&adapter->pdev->dev, "EEH resume failed\n"); | 4104 | dev_err(&adapter->pdev->dev, "EEH resume failed\n"); |
4105 | } | 4105 | } |
4106 | 4106 | ||
4107 | static struct pci_error_handlers be_eeh_handlers = { | 4107 | static const struct pci_error_handlers be_eeh_handlers = { |
4108 | .error_detected = be_eeh_err_detected, | 4108 | .error_detected = be_eeh_err_detected, |
4109 | .slot_reset = be_eeh_reset, | 4109 | .slot_reset = be_eeh_reset, |
4110 | .resume = be_eeh_resume, | 4110 | .resume = be_eeh_resume, |
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c index 535f94fac4a1..29ce9bd27f94 100644 --- a/drivers/net/ethernet/intel/e100.c +++ b/drivers/net/ethernet/intel/e100.c | |||
@@ -3157,7 +3157,7 @@ static void e100_io_resume(struct pci_dev *pdev) | |||
3157 | } | 3157 | } |
3158 | } | 3158 | } |
3159 | 3159 | ||
3160 | static struct pci_error_handlers e100_err_handler = { | 3160 | static const struct pci_error_handlers e100_err_handler = { |
3161 | .error_detected = e100_io_error_detected, | 3161 | .error_detected = e100_io_error_detected, |
3162 | .slot_reset = e100_io_slot_reset, | 3162 | .slot_reset = e100_io_slot_reset, |
3163 | .resume = e100_io_resume, | 3163 | .resume = e100_io_resume, |
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c index 3bfbb8df8989..524cfb4cac61 100644 --- a/drivers/net/ethernet/intel/e1000/e1000_main.c +++ b/drivers/net/ethernet/intel/e1000/e1000_main.c | |||
@@ -192,7 +192,7 @@ static pci_ers_result_t e1000_io_error_detected(struct pci_dev *pdev, | |||
192 | static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev); | 192 | static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev); |
193 | static void e1000_io_resume(struct pci_dev *pdev); | 193 | static void e1000_io_resume(struct pci_dev *pdev); |
194 | 194 | ||
195 | static struct pci_error_handlers e1000_err_handler = { | 195 | static const struct pci_error_handlers e1000_err_handler = { |
196 | .error_detected = e1000_io_error_detected, | 196 | .error_detected = e1000_io_error_detected, |
197 | .slot_reset = e1000_io_slot_reset, | 197 | .slot_reset = e1000_io_slot_reset, |
198 | .resume = e1000_io_resume, | 198 | .resume = e1000_io_resume, |
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 95b245310f17..1c650ecae88d 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
@@ -6472,7 +6472,7 @@ static void __devexit e1000_remove(struct pci_dev *pdev) | |||
6472 | } | 6472 | } |
6473 | 6473 | ||
6474 | /* PCI Error Recovery (ERS) */ | 6474 | /* PCI Error Recovery (ERS) */ |
6475 | static struct pci_error_handlers e1000_err_handler = { | 6475 | static const struct pci_error_handlers e1000_err_handler = { |
6476 | .error_detected = e1000_io_error_detected, | 6476 | .error_detected = e1000_io_error_detected, |
6477 | .slot_reset = e1000_io_slot_reset, | 6477 | .slot_reset = e1000_io_slot_reset, |
6478 | .resume = e1000_io_resume, | 6478 | .resume = e1000_io_resume, |
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index b7c2d5050572..25270648517b 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
@@ -217,7 +217,7 @@ static pci_ers_result_t igb_io_error_detected(struct pci_dev *, | |||
217 | static pci_ers_result_t igb_io_slot_reset(struct pci_dev *); | 217 | static pci_ers_result_t igb_io_slot_reset(struct pci_dev *); |
218 | static void igb_io_resume(struct pci_dev *); | 218 | static void igb_io_resume(struct pci_dev *); |
219 | 219 | ||
220 | static struct pci_error_handlers igb_err_handler = { | 220 | static const struct pci_error_handlers igb_err_handler = { |
221 | .error_detected = igb_io_error_detected, | 221 | .error_detected = igb_io_error_detected, |
222 | .slot_reset = igb_io_slot_reset, | 222 | .slot_reset = igb_io_slot_reset, |
223 | .resume = igb_io_resume, | 223 | .resume = igb_io_resume, |
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index 0696abfe9944..0ac11f527a84 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c | |||
@@ -2833,7 +2833,7 @@ static void __devexit igbvf_remove(struct pci_dev *pdev) | |||
2833 | } | 2833 | } |
2834 | 2834 | ||
2835 | /* PCI Error Recovery (ERS) */ | 2835 | /* PCI Error Recovery (ERS) */ |
2836 | static struct pci_error_handlers igbvf_err_handler = { | 2836 | static const struct pci_error_handlers igbvf_err_handler = { |
2837 | .error_detected = igbvf_io_error_detected, | 2837 | .error_detected = igbvf_io_error_detected, |
2838 | .slot_reset = igbvf_io_slot_reset, | 2838 | .slot_reset = igbvf_io_slot_reset, |
2839 | .resume = igbvf_io_resume, | 2839 | .resume = igbvf_io_resume, |
diff --git a/drivers/net/ethernet/intel/ixgb/ixgb_main.c b/drivers/net/ethernet/intel/ixgb/ixgb_main.c index d05fc95befc5..d99a2d51b948 100644 --- a/drivers/net/ethernet/intel/ixgb/ixgb_main.c +++ b/drivers/net/ethernet/intel/ixgb/ixgb_main.c | |||
@@ -115,7 +115,7 @@ static pci_ers_result_t ixgb_io_error_detected (struct pci_dev *pdev, | |||
115 | static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev); | 115 | static pci_ers_result_t ixgb_io_slot_reset (struct pci_dev *pdev); |
116 | static void ixgb_io_resume (struct pci_dev *pdev); | 116 | static void ixgb_io_resume (struct pci_dev *pdev); |
117 | 117 | ||
118 | static struct pci_error_handlers ixgb_err_handler = { | 118 | static const struct pci_error_handlers ixgb_err_handler = { |
119 | .error_detected = ixgb_io_error_detected, | 119 | .error_detected = ixgb_io_error_detected, |
120 | .slot_reset = ixgb_io_slot_reset, | 120 | .slot_reset = ixgb_io_slot_reset, |
121 | .resume = ixgb_io_resume, | 121 | .resume = ixgb_io_resume, |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 4326f74f7137..ade4d81a3177 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | |||
@@ -7677,7 +7677,7 @@ static void ixgbe_io_resume(struct pci_dev *pdev) | |||
7677 | netif_device_attach(netdev); | 7677 | netif_device_attach(netdev); |
7678 | } | 7678 | } |
7679 | 7679 | ||
7680 | static struct pci_error_handlers ixgbe_err_handler = { | 7680 | static const struct pci_error_handlers ixgbe_err_handler = { |
7681 | .error_detected = ixgbe_io_error_detected, | 7681 | .error_detected = ixgbe_io_error_detected, |
7682 | .slot_reset = ixgbe_io_slot_reset, | 7682 | .slot_reset = ixgbe_io_slot_reset, |
7683 | .resume = ixgbe_io_resume, | 7683 | .resume = ixgbe_io_resume, |
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 60ef64587412..6647383c4ddc 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
@@ -3256,7 +3256,7 @@ static void ixgbevf_io_resume(struct pci_dev *pdev) | |||
3256 | } | 3256 | } |
3257 | 3257 | ||
3258 | /* PCI Error Recovery (ERS) */ | 3258 | /* PCI Error Recovery (ERS) */ |
3259 | static struct pci_error_handlers ixgbevf_err_handler = { | 3259 | static const struct pci_error_handlers ixgbevf_err_handler = { |
3260 | .error_detected = ixgbevf_io_error_detected, | 3260 | .error_detected = ixgbevf_io_error_detected, |
3261 | .slot_reset = ixgbevf_io_slot_reset, | 3261 | .slot_reset = ixgbevf_io_slot_reset, |
3262 | .resume = ixgbevf_io_resume, | 3262 | .resume = ixgbevf_io_resume, |
diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 48d0e90194cb..d89e89b415cf 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c | |||
@@ -2301,7 +2301,7 @@ static pci_ers_result_t mlx4_pci_slot_reset(struct pci_dev *pdev) | |||
2301 | return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; | 2301 | return ret ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED; |
2302 | } | 2302 | } |
2303 | 2303 | ||
2304 | static struct pci_error_handlers mlx4_err_handler = { | 2304 | static const struct pci_error_handlers mlx4_err_handler = { |
2305 | .error_detected = mlx4_pci_err_detected, | 2305 | .error_detected = mlx4_pci_err_detected, |
2306 | .slot_reset = mlx4_pci_slot_reset, | 2306 | .slot_reset = mlx4_pci_slot_reset, |
2307 | }; | 2307 | }; |
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index d958c2299372..de50547c187d 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c | |||
@@ -484,7 +484,7 @@ static DEFINE_PCI_DEVICE_TABLE(s2io_tbl) = { | |||
484 | 484 | ||
485 | MODULE_DEVICE_TABLE(pci, s2io_tbl); | 485 | MODULE_DEVICE_TABLE(pci, s2io_tbl); |
486 | 486 | ||
487 | static struct pci_error_handlers s2io_err_handler = { | 487 | static const struct pci_error_handlers s2io_err_handler = { |
488 | .error_detected = s2io_io_error_detected, | 488 | .error_detected = s2io_io_error_detected, |
489 | .slot_reset = s2io_io_slot_reset, | 489 | .slot_reset = s2io_io_slot_reset, |
490 | .resume = s2io_io_resume, | 490 | .resume = s2io_io_resume, |
diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index de2190443510..cfa71a30dc8d 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c | |||
@@ -4799,7 +4799,7 @@ static void __devexit vxge_remove(struct pci_dev *pdev) | |||
4799 | __LINE__); | 4799 | __LINE__); |
4800 | } | 4800 | } |
4801 | 4801 | ||
4802 | static struct pci_error_handlers vxge_err_handler = { | 4802 | static const struct pci_error_handlers vxge_err_handler = { |
4803 | .error_detected = vxge_io_error_detected, | 4803 | .error_detected = vxge_io_error_detected, |
4804 | .slot_reset = vxge_io_slot_reset, | 4804 | .slot_reset = vxge_io_slot_reset, |
4805 | .resume = vxge_io_resume, | 4805 | .resume = vxge_io_resume, |
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index feb85d56c750..b2a94d02a521 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | |||
@@ -2795,7 +2795,7 @@ static const struct dev_pm_ops pch_gbe_pm_ops = { | |||
2795 | }; | 2795 | }; |
2796 | #endif | 2796 | #endif |
2797 | 2797 | ||
2798 | static struct pci_error_handlers pch_gbe_err_handler = { | 2798 | static const struct pci_error_handlers pch_gbe_err_handler = { |
2799 | .error_detected = pch_gbe_io_error_detected, | 2799 | .error_detected = pch_gbe_io_error_detected, |
2800 | .slot_reset = pch_gbe_io_slot_reset, | 2800 | .slot_reset = pch_gbe_io_slot_reset, |
2801 | .resume = pch_gbe_io_resume | 2801 | .resume = pch_gbe_io_resume |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c index 342b3a79bd0f..0fa18ae07de5 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c | |||
@@ -3336,7 +3336,7 @@ netxen_free_vlan_ip_list(struct netxen_adapter *adapter) | |||
3336 | { } | 3336 | { } |
3337 | #endif | 3337 | #endif |
3338 | 3338 | ||
3339 | static struct pci_error_handlers netxen_err_handler = { | 3339 | static const struct pci_error_handlers netxen_err_handler = { |
3340 | .error_detected = netxen_io_error_detected, | 3340 | .error_detected = netxen_io_error_detected, |
3341 | .slot_reset = netxen_io_slot_reset, | 3341 | .slot_reset = netxen_io_slot_reset, |
3342 | .resume = netxen_io_resume, | 3342 | .resume = netxen_io_resume, |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 212c12193275..473ce134ca63 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |||
@@ -4522,7 +4522,7 @@ static void | |||
4522 | qlcnic_restore_indev_addr(struct net_device *dev, unsigned long event) | 4522 | qlcnic_restore_indev_addr(struct net_device *dev, unsigned long event) |
4523 | { } | 4523 | { } |
4524 | #endif | 4524 | #endif |
4525 | static struct pci_error_handlers qlcnic_err_handler = { | 4525 | static const struct pci_error_handlers qlcnic_err_handler = { |
4526 | .error_detected = qlcnic_io_error_detected, | 4526 | .error_detected = qlcnic_io_error_detected, |
4527 | .slot_reset = qlcnic_io_slot_reset, | 4527 | .slot_reset = qlcnic_io_slot_reset, |
4528 | .resume = qlcnic_io_resume, | 4528 | .resume = qlcnic_io_resume, |
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_main.c b/drivers/net/ethernet/qlogic/qlge/qlge_main.c index b53a3b60b648..b262d6156816 100644 --- a/drivers/net/ethernet/qlogic/qlge/qlge_main.c +++ b/drivers/net/ethernet/qlogic/qlge/qlge_main.c | |||
@@ -4847,7 +4847,7 @@ static void qlge_io_resume(struct pci_dev *pdev) | |||
4847 | netif_device_attach(ndev); | 4847 | netif_device_attach(ndev); |
4848 | } | 4848 | } |
4849 | 4849 | ||
4850 | static struct pci_error_handlers qlge_err_handler = { | 4850 | static const struct pci_error_handlers qlge_err_handler = { |
4851 | .error_detected = qlge_io_error_detected, | 4851 | .error_detected = qlge_io_error_detected, |
4852 | .slot_reset = qlge_io_slot_reset, | 4852 | .slot_reset = qlge_io_slot_reset, |
4853 | .resume = qlge_io_resume, | 4853 | .resume = qlge_io_resume, |