Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1959ec5f authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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
parents a63ab613 1d352035

drivers/block/nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -1675,7 +1675,7 @@ static void __devexit nvme_remove(struct pci_dev *pdev) 
#define nvme_suspend NULL

#define nvme_resume NULL



static struct pci_error_handlers nvme_err_handler = {

static const struct pci_error_handlers nvme_err_handler = {

	.error_detected	= nvme_error_detected,

	.mmio_enabled	= nvme_dump_registers,

	.link_reset	= nvme_link_reset,

drivers/infiniband/hw/qib/qib.h

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ struct qlogic_ib_stats { 
};



extern struct qlogic_ib_stats qib_stats;

extern struct pci_error_handlers qib_pci_err_handler;

extern const struct pci_error_handlers qib_pci_err_handler;

extern struct pci_driver qib_driver;



#define QIB_CHIP_SWVERSION QIB_CHIP_VERS_MAJ

drivers/infiniband/hw/qib/qib_pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ qib_pci_resume(struct pci_dev *pdev) 
	qib_init(dd, 1); /* same as re-init after reset */

}



struct pci_error_handlers qib_pci_err_handler = {

const struct pci_error_handlers qib_pci_err_handler = {

	.error_detected = qib_pci_error_detected,

	.mmio_enabled = qib_pci_mmio_enabled,

	.link_reset = qib_pci_link_reset,

drivers/media/dvb/ngene/ngene-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static void ngene_resume(struct pci_dev *dev) 
	printk(KERN_INFO DEVICE_NAME ": resume\n");

}



static struct pci_error_handlers ngene_errors = {

static const struct pci_error_handlers ngene_errors = {

	.error_detected = ngene_error_detected,

	.link_reset = ngene_link_reset,

	.slot_reset = ngene_slot_reset,

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2685,7 +2685,7 @@ static void atl1c_io_resume(struct pci_dev *pdev) 
	netif_device_attach(netdev);

}



static struct pci_error_handlers atl1c_err_handler = {

static const struct pci_error_handlers atl1c_err_handler = {

	.error_detected = atl1c_io_error_detected,

	.slot_reset = atl1c_io_slot_reset,

	.resume = atl1c_io_resume,