From: Bjorn Helgaas <bhelgaas@google.com>
Date: Thu, 27 Mar 2025 18:15:05 +0000 (-0500)
Subject: Merge branch 'pci/misc'
X-Git-Tag: nvme-6.15-2025-04-02~45^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dea140198b846f7432d78566b7b0b83979c72c2b;p=nvme.git

Merge branch 'pci/misc'

- Remove unused tools 'pci' build target left over after moving tests to
  tools/testing/selftests/pci_endpoint (Jianfeng Liu)

- Fix typos and whitespace errors (Bjorn Helgaas)

* pci/misc:
  PCI: Fix typos
  tools/Makefile: Remove pci target

# Conflicts:
#	drivers/pci/endpoint/functions/pci-epf-test.c
---

dea140198b846f7432d78566b7b0b83979c72c2b
diff --cc drivers/pci/endpoint/functions/pci-epf-test.c
index ac3ec883cc71,ee1416c43f03..50eb4106369f
--- a/drivers/pci/endpoint/functions/pci-epf-test.c
+++ b/drivers/pci/endpoint/functions/pci-epf-test.c
@@@ -653,9 -631,9 +653,9 @@@ static void pci_epf_test_raise_irq(stru
  		break;
  	case IRQ_TYPE_MSIX:
  		count = pci_epc_get_msix(epc, epf->func_no, epf->vfunc_no);
 -		if (reg->irq_number > count || count <= 0) {
 +		if (irq_number > count || count <= 0) {
- 			dev_err(dev, "Invalid MSIX IRQ number %d / %d\n",
+ 			dev_err(dev, "Invalid MSI-X IRQ number %d / %d\n",
 -				reg->irq_number, count);
 +				irq_number, count);
  			return;
  		}
  		pci_epc_raise_irq(epc, epf->func_no, epf->vfunc_no,