From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 6 Jun 2018 21:10:30 +0000 (-0500)
Subject: Merge branch 'lorenzo/pci/endpoint'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bf79d7d0997abfab40b421a0360adcc4fdbda0a4;p=linux.git

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()
---

bf79d7d0997abfab40b421a0360adcc4fdbda0a4
diff --cc drivers/pci/endpoint/functions/pci-epf-test.c
index bee401d992173,4dac001f2d1d5..63ed706445b9f
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@@ -435,16 -435,9 +435,16 @@@ static int pci_epf_test_bind(struct pci
  	if (WARN_ON_ONCE(!epc))
  		return -EINVAL;
  
 +	if (epc->features & EPC_FEATURE_NO_LINKUP_NOTIFIER)
 +		epf_test->linkup_notifier = false;
 +	else
 +		epf_test->linkup_notifier = true;
 +
 +	epf_test->test_reg_bar = EPC_FEATURE_GET_BAR(epc->features);
 +
  	ret = pci_epc_write_header(epc, epf->func_no, header);
  	if (ret) {
- 		dev_err(dev, "configuration header write failed\n");
+ 		dev_err(dev, "Configuration header write failed\n");
  		return ret;
  	}