Commit d43e4239 authored by Bjorn Helgaas's avatar Bjorn Helgaas

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
...@@ -644,7 +644,7 @@ static void pci_epf_mhi_unbind(struct pci_epf *epf) ...@@ -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); 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, .core_init = pci_epf_mhi_core_init,
.link_up = pci_epf_mhi_link_up, .link_up = pci_epf_mhi_link_up,
.link_down = pci_epf_mhi_link_down, .link_down = pci_epf_mhi_link_down,
...@@ -682,7 +682,7 @@ static const struct pci_epf_device_id pci_epf_mhi_ids[] = { ...@@ -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, .unbind = pci_epf_mhi_unbind,
.bind = pci_epf_mhi_bind, .bind = pci_epf_mhi_bind,
}; };
......
...@@ -2099,7 +2099,7 @@ static int epf_ntb_probe(struct pci_epf *epf, ...@@ -2099,7 +2099,7 @@ static int epf_ntb_probe(struct pci_epf *epf,
return 0; return 0;
} }
static struct pci_epf_ops epf_ntb_ops = { static const struct pci_epf_ops epf_ntb_ops = {
.bind = epf_ntb_bind, .bind = epf_ntb_bind,
.unbind = epf_ntb_unbind, .unbind = epf_ntb_unbind,
.add_cfs = epf_ntb_add_cfs, .add_cfs = epf_ntb_add_cfs,
......
...@@ -973,7 +973,7 @@ static int pci_epf_test_probe(struct pci_epf *epf, ...@@ -973,7 +973,7 @@ static int pci_epf_test_probe(struct pci_epf *epf,
return 0; return 0;
} }
static struct pci_epf_ops ops = { static const struct pci_epf_ops ops = {
.unbind = pci_epf_test_unbind, .unbind = pci_epf_test_unbind,
.bind = pci_epf_test_bind, .bind = pci_epf_test_bind,
}; };
......
...@@ -1384,7 +1384,7 @@ static void epf_ntb_unbind(struct pci_epf *epf) ...@@ -1384,7 +1384,7 @@ static void epf_ntb_unbind(struct pci_epf *epf)
} }
// EPF driver probe // EPF driver probe
static struct pci_epf_ops epf_ntb_ops = { static const struct pci_epf_ops epf_ntb_ops = {
.bind = epf_ntb_bind, .bind = epf_ntb_bind,
.unbind = epf_ntb_unbind, .unbind = epf_ntb_unbind,
.add_cfs = epf_ntb_add_cfs, .add_cfs = epf_ntb_add_cfs,
......
...@@ -98,7 +98,7 @@ struct pci_epf_driver { ...@@ -98,7 +98,7 @@ struct pci_epf_driver {
void (*remove)(struct pci_epf *epf); void (*remove)(struct pci_epf *epf);
struct device_driver driver; struct device_driver driver;
struct pci_epf_ops *ops; const struct pci_epf_ops *ops;
struct module *owner; struct module *owner;
struct list_head epf_group; struct list_head epf_group;
const struct pci_epf_device_id *id_table; const struct pci_epf_device_id *id_table;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment