Commit 49453028 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Bjorn Helgaas
Browse files

PCI: Make pci_error_handlers const 



Since pci_error_handlers is just a function table make it const.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarLinas Vepstas <linasvepstas@gmail.com>
parent 0d7614f0

drivers/pci/pcie/aer/aerdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static pci_ers_result_t aer_error_detected(struct pci_dev *dev, 
static void aer_error_resume(struct pci_dev *dev);

static pci_ers_result_t aer_root_reset(struct pci_dev *dev);



static struct pci_error_handlers aer_error_handlers = {

static const struct pci_error_handlers aer_error_handlers = {

	.error_detected = aer_error_detected,

	.resume		= aer_error_resume,

};

drivers/pci/pcie/aer/aerdrv_core.c

+4 −4
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static bool find_source_device(struct pci_dev *parent, 
static int report_error_detected(struct pci_dev *dev, void *data)

{

	pci_ers_result_t vote;

	struct pci_error_handlers *err_handler;

	const struct pci_error_handlers *err_handler;

	struct aer_broadcast_data *result_data;

	result_data = (struct aer_broadcast_data *) data;
@@ -274,7 +274,7 @@ static int report_error_detected(struct pci_dev *dev, void *data) 
static int report_mmio_enabled(struct pci_dev *dev, void *data)

{

	pci_ers_result_t vote;

	struct pci_error_handlers *err_handler;

	const struct pci_error_handlers *err_handler;

	struct aer_broadcast_data *result_data;

	result_data = (struct aer_broadcast_data *) data;
@@ -292,7 +292,7 @@ static int report_mmio_enabled(struct pci_dev *dev, void *data) 
static int report_slot_reset(struct pci_dev *dev, void *data)

{

	pci_ers_result_t vote;

	struct pci_error_handlers *err_handler;

	const struct pci_error_handlers *err_handler;

	struct aer_broadcast_data *result_data;

	result_data = (struct aer_broadcast_data *) data;
@@ -309,7 +309,7 @@ static int report_slot_reset(struct pci_dev *dev, void *data) 


static int report_resume(struct pci_dev *dev, void *data)

{

	struct pci_error_handlers *err_handler;

	const struct pci_error_handlers *err_handler;



	dev->error_state = pci_channel_io_normal;

drivers/pci/pcie/portdrv_pci.c

+5 −5
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static const struct pci_device_id port_pci_ids[] = { { 
};

MODULE_DEVICE_TABLE(pci, port_pci_ids);



static struct pci_error_handlers pcie_portdrv_err_handler = {

static const struct pci_error_handlers pcie_portdrv_err_handler = {

	.error_detected = pcie_portdrv_error_detected,

	.mmio_enabled = pcie_portdrv_mmio_enabled,

	.slot_reset = pcie_portdrv_slot_reset,

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ struct pci_driver { 
	int  (*resume_early) (struct pci_dev *dev);

	int  (*resume) (struct pci_dev *dev);	                /* Device woken up */

	void (*shutdown) (struct pci_dev *dev);

	struct pci_error_handlers *err_handler;

	const struct pci_error_handlers *err_handler;

	struct device_driver	driver;

	struct pci_dynids dynids;

};

include/linux/pcieport_if.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct pcie_port_service_driver { 
	int (*resume) (struct pcie_device *dev);



	/* Service Error Recovery Handler */

	struct pci_error_handlers *err_handler;

	const struct pci_error_handlers *err_handler;



	/* Link Reset Capability - AER service driver specific */

	pci_ers_result_t (*reset_link) (struct pci_dev *dev);