diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2022-12-10 10:36:40 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-12-10 10:36:40 -0600 |
| commit | bcccaa0a4857433aad8ed9874c496cb2e385d470 (patch) | |
| tree | 0e5145fd68a76df8ae6430c3094749c3416b2518 /drivers/pci | |
| parent | ba7deaa2a8e48d8a31608b5dca58dbe119c0d72a (diff) | |
| parent | 2759ddf7535d63381f9b9b1412e4c46e13ed773a (diff) | |
| download | linux-bcccaa0a4857433aad8ed9874c496cb2e385d470.tar.gz linux-bcccaa0a4857433aad8ed9874c496cb2e385d470.tar.bz2 linux-bcccaa0a4857433aad8ed9874c496cb2e385d470.zip | |
Merge branch 'remotes/lorenzo/pci/misc'
- Register notifier if core_init_notifier is enabled in pci-epf-test
(Kunihiko Hayashi)
- Fixup Kconfig indentation (Shunsuke Mie)
* remotes/lorenzo/pci/misc:
PCI: endpoint: Fix Kconfig indent style
PCI: pci-epf-test: Register notifier if only core_init_notifier is enabled
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/endpoint/functions/Kconfig | 18 | ||||
| -rw-r--r-- | drivers/pci/endpoint/functions/pci-epf-test.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/pci/endpoint/functions/Kconfig b/drivers/pci/endpoint/functions/Kconfig index 295a033ee9a2..9fd560886871 100644 --- a/drivers/pci/endpoint/functions/Kconfig +++ b/drivers/pci/endpoint/functions/Kconfig @@ -27,13 +27,13 @@ config PCI_EPF_NTB If in doubt, say "N" to disable Endpoint NTB driver. config PCI_EPF_VNTB - tristate "PCI Endpoint NTB driver" - depends on PCI_ENDPOINT - depends on NTB - select CONFIGFS_FS - help - Select this configuration option to enable the Non-Transparent - Bridge (NTB) driver for PCIe Endpoint. NTB driver implements NTB - between PCI Root Port and PCIe Endpoint. + tristate "PCI Endpoint NTB driver" + depends on PCI_ENDPOINT + depends on NTB + select CONFIGFS_FS + help + Select this configuration option to enable the Non-Transparent + Bridge (NTB) driver for PCIe Endpoint. NTB driver implements NTB + between PCI Root Port and PCIe Endpoint. - If in doubt, say "N" to disable Endpoint NTB driver. + If in doubt, say "N" to disable Endpoint NTB driver. diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index 36b1801a061b..55283d2379a6 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -979,7 +979,7 @@ static int pci_epf_test_bind(struct pci_epf *epf) if (ret) epf_test->dma_supported = false; - if (linkup_notifier) { + if (linkup_notifier || core_init_notifier) { epf->nb.notifier_call = pci_epf_test_notifier; pci_epc_register_notifier(epc, &epf->nb); } else { |