Commit d43e4239 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/endpoint' 

- Make struct pci_epc_event_ops and struct pci_epf_ops instances const
  (Lars-Peter Clausen)

* pci/endpoint:
  PCI: endpoint: pci-epf-test: Make struct pci_epf_ops const
  PCI: endpoint: pci-epf-vntb: Make struct pci_epf_ops const
  PCI: endpoint: pci-epf-ntb: Make struct pci_epf_ops const
  PCI: endpoint: pci-epf-mhi: Make structs pci_epf_ops and pci_epf_event_ops const
  PCI: endpoint: Make struct pci_epf_ops in pci_epf_driver const
parents dc14155d 6f517e04

drivers/pci/endpoint/functions/pci-epf-mhi.c

+2 −2
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ static void pci_epf_mhi_unbind(struct pci_epf *epf) 
	pci_epc_clear_bar(epc, epf->func_no, epf->vfunc_no, epf_bar);

}



static struct pci_epc_event_ops pci_epf_mhi_event_ops = {

static const struct pci_epc_event_ops pci_epf_mhi_event_ops = {

	.core_init = pci_epf_mhi_core_init,

	.link_up = pci_epf_mhi_link_up,

	.link_down = pci_epf_mhi_link_down,
@@ -682,7 +682,7 @@ static const struct pci_epf_device_id pci_epf_mhi_ids[] = { 
	{},

};



static struct pci_epf_ops pci_epf_mhi_ops = {

static const struct pci_epf_ops pci_epf_mhi_ops = {

	.unbind	= pci_epf_mhi_unbind,

	.bind	= pci_epf_mhi_bind,

};

drivers/pci/endpoint/functions/pci-epf-ntb.c

+1 −1
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ static int epf_ntb_probe(struct pci_epf *epf, 
	return 0;

}



static struct pci_epf_ops epf_ntb_ops = {

static const struct pci_epf_ops epf_ntb_ops = {

	.bind	= epf_ntb_bind,

	.unbind	= epf_ntb_unbind,

	.add_cfs = epf_ntb_add_cfs,

drivers/pci/endpoint/functions/pci-epf-test.c

+1 −1
Original line number Diff line number Diff line
@@ -973,7 +973,7 @@ static int pci_epf_test_probe(struct pci_epf *epf, 
	return 0;

}



static struct pci_epf_ops ops = {

static const struct pci_epf_ops ops = {

	.unbind	= pci_epf_test_unbind,

	.bind	= pci_epf_test_bind,

};

drivers/pci/endpoint/functions/pci-epf-vntb.c

+1 −1
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ static void epf_ntb_unbind(struct pci_epf *epf) 
}



// EPF driver probe

static struct pci_epf_ops epf_ntb_ops = {

static const struct pci_epf_ops epf_ntb_ops = {

	.bind   = epf_ntb_bind,

	.unbind = epf_ntb_unbind,

	.add_cfs = epf_ntb_add_cfs,

include/linux/pci-epf.h

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ struct pci_epf_driver { 
	void	(*remove)(struct pci_epf *epf);



	struct device_driver	driver;

	struct pci_epf_ops	*ops;

	const struct pci_epf_ops *ops;

	struct module		*owner;

	struct list_head	epf_group;

	const struct pci_epf_device_id	*id_table;