From: Bjorn Helgaas <bhelgaas@google.com>
Date: Mon, 15 Jan 2024 18:10:40 +0000 (-0600)
Subject: Merge branch 'pci/irq-clean-up'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dc14155d46b58d8bb6e68970b3314118b79497b7;p=linux.git

Merge branch 'pci/irq-clean-up'

- Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX to be more explicit and match spec
  terminology (Bjorn Helgaas)

- Use existing PCI_IRQ_INTX, PCI_IRQ_MSI, PCI_IRQ_MSIX in artpec6, cadence,
  designware, designware-plat, dra7xx, imx6, keembay, keystone, layerscape,
  mhi, ntb, qcom, rcar, rcar-gen4, rockchip, tegra194, uniphier, vntb; drop
  the redundant pci_epc_irq_type enum with the same values (Damien Le Moal)

- Use "intx" instead of "leg" or "legacy" when describing INTx interrupts
  in endpoint core, endpoint tests, cadence, dra7xx, designware,
  dw-rockchip, dwc core, imx6, keystone, layerscape, qcom, rcar-gen4,
  rockchip, tegra194, uniphier, xilinx-nwl (Damien Le Moal)

* pci/irq-clean-up:
  PCI: xilinx-nwl: Use INTX instead of legacy
  PCI: rockchip-host: Rename rockchip_pcie_legacy_int_handler()
  PCI: rockchip-ep: Use INTX instead of legacy
  PCI: uniphier: Use INTX instead of legacy
  PCI: tegra194: Use INTX instead of legacy
  PCI: dw-rockchip: Rename rockchip_pcie_legacy_int_handler()
  PCI: keystone: Use INTX instead of legacy
  PCI: dwc: Rename dw_pcie_ep_raise_legacy_irq()
  PCI: cadence: Use INTX instead of legacy
  PCI: dra7xx: Rename dra7xx_pcie_raise_legacy_irq()
  misc: pci_endpoint_test: Use INTX instead of LEGACY
  PCI: endpoint: Rename LEGACY to INTX in test function driver
  PCI: endpoint: Use INTX instead of legacy
  PCI: endpoint: Drop PCI_EPC_IRQ_XXX definitions
  PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
---

dc14155d46b58d8bb6e68970b3314118b79497b7
diff --cc drivers/pci/controller/dwc/pcie-designware.h
index e8ec4f11ce9d1,d55b28f3f156a..26dae48374627
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@@ -332,10 -332,10 +332,10 @@@ struct dw_pcie_rp 
  
  struct dw_pcie_ep_ops {
  	void	(*pre_init)(struct dw_pcie_ep *ep);
 -	void	(*ep_init)(struct dw_pcie_ep *ep);
 +	void	(*init)(struct dw_pcie_ep *ep);
  	void	(*deinit)(struct dw_pcie_ep *ep);
  	int	(*raise_irq)(struct dw_pcie_ep *ep, u8 func_no,
- 			     enum pci_epc_irq_type type, u16 interrupt_num);
+ 			     unsigned int type, u16 interrupt_num);
  	const struct pci_epc_features* (*get_features)(struct dw_pcie_ep *ep);
  	/*
  	 * Provide a method to implement the different func config space