aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2012-09-07 12:33:17 -0400
committerBjorn Helgaas <bhelgaas@google.com>2012-09-07 18:35:00 -0400
commit1d3520357df99baf4ad89f86268ac96cd38092d9 (patch)
tree33edbde95dc8970166244b4d669ee0b6570b3842
parenta55b2d21e81ad318b7c67a2c8530b272f631e35b (diff)
make drivers with pci error handlers const
Covers the rest of the uses of pci error handler. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/block/nvme.c2
-rw-r--r--drivers/infiniband/hw/qib/qib.h2
-rw-r--r--drivers/infiniband/hw/qib/qib_pcie.c2
-rw-r--r--drivers/media/dvb/ngene/ngene-cards.c2
-rw-r--r--drivers/tty/serial/8250/8250_pci.c2
-rw-r--r--drivers/tty/serial/jsm/jsm_driver.c2
-rw-r--r--drivers/xen/xen-pciback/pci_stub.c2
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 38a2d0631882..c95ca0f8ff84 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -1675,7 +1675,7 @@ static void __devexit nvme_remove(struct pci_dev *pdev)
1675#define nvme_suspend NULL 1675#define nvme_suspend NULL
1676#define nvme_resume NULL 1676#define nvme_resume NULL
1677 1677
1678static struct pci_error_handlers nvme_err_handler = { 1678static const struct pci_error_handlers nvme_err_handler = {
1679 .error_detected = nvme_error_detected, 1679 .error_detected = nvme_error_detected,
1680 .mmio_enabled = nvme_dump_registers, 1680 .mmio_enabled = nvme_dump_registers,
1681 .link_reset = nvme_link_reset, 1681 .link_reset = nvme_link_reset,
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 7b1b86690024..4d11575c2010 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -87,7 +87,7 @@ struct qlogic_ib_stats {
87}; 87};
88 88
89extern struct qlogic_ib_stats qib_stats; 89extern struct qlogic_ib_stats qib_stats;
90extern struct pci_error_handlers qib_pci_err_handler; 90extern const struct pci_error_handlers qib_pci_err_handler;
91extern struct pci_driver qib_driver; 91extern struct pci_driver qib_driver;
92 92
93#define QIB_CHIP_SWVERSION QIB_CHIP_VERS_MAJ 93#define QIB_CHIP_SWVERSION QIB_CHIP_VERS_MAJ
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 062c301ebf53..8fd03a8c7354 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -753,7 +753,7 @@ qib_pci_resume(struct pci_dev *pdev)
753 qib_init(dd, 1); /* same as re-init after reset */ 753 qib_init(dd, 1); /* same as re-init after reset */
754} 754}
755 755
756struct pci_error_handlers qib_pci_err_handler = { 756const struct pci_error_handlers qib_pci_err_handler = {
757 .error_detected = qib_pci_error_detected, 757 .error_detected = qib_pci_error_detected,
758 .mmio_enabled = qib_pci_mmio_enabled, 758 .mmio_enabled = qib_pci_mmio_enabled,
759 .link_reset = qib_pci_link_reset, 759 .link_reset = qib_pci_link_reset,
diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 72ee8de02260..0a497be97af8 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -524,7 +524,7 @@ static void ngene_resume(struct pci_dev *dev)
524 printk(KERN_INFO DEVICE_NAME ": resume\n"); 524 printk(KERN_INFO DEVICE_NAME ": resume\n");
525} 525}
526 526
527static struct pci_error_handlers ngene_errors = { 527static const struct pci_error_handlers ngene_errors = {
528 .error_detected = ngene_error_detected, 528 .error_detected = ngene_error_detected,
529 .link_reset = ngene_link_reset, 529 .link_reset = ngene_link_reset,
530 .slot_reset = ngene_slot_reset, 530 .slot_reset = ngene_slot_reset,
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 28e7c7cce893..452278efef29 100644
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -4236,7 +4236,7 @@ static void serial8250_io_resume(struct pci_dev *dev)
4236 pciserial_resume_ports(priv); 4236 pciserial_resume_ports(priv);
4237} 4237}
4238 4238
4239static struct pci_error_handlers serial8250_err_handler = { 4239static const struct pci_error_handlers serial8250_err_handler = {
4240 .error_detected = serial8250_io_error_detected, 4240 .error_detected = serial8250_io_error_detected,
4241 .slot_reset = serial8250_io_slot_reset, 4241 .slot_reset = serial8250_io_slot_reset,
4242 .resume = serial8250_io_resume, 4242 .resume = serial8250_io_resume,
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c
index 7545fe1b9925..5ab3c3b595e4 100644
--- a/drivers/tty/serial/jsm/jsm_driver.c
+++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -54,7 +54,7 @@ static pci_ers_result_t jsm_io_error_detected(struct pci_dev *pdev,
54static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev); 54static pci_ers_result_t jsm_io_slot_reset(struct pci_dev *pdev);
55static void jsm_io_resume(struct pci_dev *pdev); 55static void jsm_io_resume(struct pci_dev *pdev);
56 56
57static struct pci_error_handlers jsm_err_handler = { 57static const struct pci_error_handlers jsm_err_handler = {
58 .error_detected = jsm_io_error_detected, 58 .error_detected = jsm_io_error_detected,
59 .slot_reset = jsm_io_slot_reset, 59 .slot_reset = jsm_io_slot_reset,
60 .resume = jsm_io_resume, 60 .resume = jsm_io_resume,
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index 097e536e8672..0f1539edbd01 100644
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -871,7 +871,7 @@ end:
871} 871}
872 872
873/*add xen_pcibk AER handling*/ 873/*add xen_pcibk AER handling*/
874static struct pci_error_handlers xen_pcibk_error_handler = { 874static const struct pci_error_handlers xen_pcibk_error_handler = {
875 .error_detected = xen_pcibk_error_detected, 875 .error_detected = xen_pcibk_error_detected,
876 .mmio_enabled = xen_pcibk_mmio_enabled, 876 .mmio_enabled = xen_pcibk_mmio_enabled,
877 .slot_reset = xen_pcibk_slot_reset, 877 .slot_reset = xen_pcibk_slot_reset,