diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-07 00:10:30 +0300 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-06-07 00:10:30 +0300 |
commit | bf79d7d0997abfab40b421a0360adcc4fdbda0a4 (patch) | |
tree | f39ecbe0dbb13048a9d8e088fa5858e596bfdc03 /include | |
parent | d792b32688c65841aef256e5870f0e25ed69ed9c (diff) | |
parent | ef1433f717a2c63747a519d86965d73ff9bd08b3 (diff) | |
download | linux-bf79d7d0997abfab40b421a0360adcc4fdbda0a4.tar.xz |
Merge branch 'lorenzo/pci/endpoint'
- use usleep() instead of mdelay() in endpoint test (Jia-Ju Bai)
- add configfs entries for pci_epf_driver device IDs (Kishon Vijay
Abraham I)
- clean up pci_endpoint_test driver (Gustavo Pimentel)
* lorenzo/pci/endpoint:
PCI: endpoint: Create configfs entry for each pci_epf_device_id table entry
misc: pci_endpoint_test: Use pci_irq_vector function
PCI: endpoint: functions/pci-epf-test: Replace lower into upper case characters
misc: pci_endpoint_test: Replace lower into upper case characters
PCI: endpoint: Replace mdelay with usleep_range() in pci_epf_test_write()
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci-epf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h index f7d6f4883f8b..4e7764935fa8 100644 --- a/include/linux/pci-epf.h +++ b/include/linux/pci-epf.h @@ -72,7 +72,7 @@ struct pci_epf_ops { * @driver: PCI EPF driver * @ops: set of function pointers for performing EPF operations * @owner: the owner of the module that registers the PCI EPF driver - * @group: configfs group corresponding to the PCI EPF driver + * @epf_group: list of configfs group corresponding to the PCI EPF driver * @id_table: identifies EPF devices for probing */ struct pci_epf_driver { @@ -82,7 +82,7 @@ struct pci_epf_driver { struct device_driver driver; struct pci_epf_ops *ops; struct module *owner; - struct config_group *group; + struct list_head epf_group; const struct pci_epf_device_id *id_table; }; |