Merge branch 'pci/stephen-const' into next
* pci/stephen-const: make drivers with pci error handlers const scsi: make pci error handlers const netdev: make pci_error_handlers const PCI: Make pci_error_handlers const
This commit is contained in:
@@ -3336,7 +3336,7 @@ netxen_free_vlan_ip_list(struct netxen_adapter *adapter)
|
||||
{ }
|
||||
#endif
|
||||
|
||||
static struct pci_error_handlers netxen_err_handler = {
|
||||
static const struct pci_error_handlers netxen_err_handler = {
|
||||
.error_detected = netxen_io_error_detected,
|
||||
.slot_reset = netxen_io_slot_reset,
|
||||
.resume = netxen_io_resume,
|
||||
|
@@ -4522,7 +4522,7 @@ static void
|
||||
qlcnic_restore_indev_addr(struct net_device *dev, unsigned long event)
|
||||
{ }
|
||||
#endif
|
||||
static struct pci_error_handlers qlcnic_err_handler = {
|
||||
static const struct pci_error_handlers qlcnic_err_handler = {
|
||||
.error_detected = qlcnic_io_error_detected,
|
||||
.slot_reset = qlcnic_io_slot_reset,
|
||||
.resume = qlcnic_io_resume,
|
||||
|
@@ -4847,7 +4847,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
|
||||
netif_device_attach(ndev);
|
||||
}
|
||||
|
||||
static struct pci_error_handlers qlge_err_handler = {
|
||||
static const struct pci_error_handlers qlge_err_handler = {
|
||||
.error_detected = qlge_io_error_detected,
|
||||
.slot_reset = qlge_io_slot_reset,
|
||||
.resume = qlge_io_resume,
|
||||
|
Reference in New Issue
Block a user