Skip to contentSkip to conversation

PCI: Remove unnecessary <linux/of_irq.h> includes

PATCH In review Bjorn Helgaas 3 participants 9 messages Oct 31, 2022 – Nov 11, 2022

Subsystems (18)
lore
Share & tools
lore
#0 lore raw

v3 cover PCI: Remove unnecessary <linux/of_irq.h> includes

From: Bjorn Helgaas <[email protected]>

Many host controller drivers #include <linux/of_irq.h> even though they don't need it. Remove the unnecessary #includes.

v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/

Changes from v2 to v3:
- Include <linux/irqdomain.h> explicitly in xgene-msi, which doesn't need <linux/of_irq.h> itself, but relied on it to include <linux/irqdomain.h>. On x86, this was covered up by the fact that <linux/msi.h> includes <asm/msi.h>, which includes <asm/irqdomain.h>, which includes <linux/irqdomain.h>. But on parisc, <asm/msi.h> is actually asm-generic/msi.h, which does *not* include <linux/irqdomain.h>
- Pick up tags from Conor Dooley and Thomas Petazzoni

Changes from v1 to v2:
- Include <linux/irqdomain.h> explicitly in altera-msi and microchip, which don't need <linux/of_irq.h> itself, but relied on it to include <linux/irqdomain.h>
- Include <linux/irqdomain.h> explicitly in mvebu, which needs both it and <linux/of_irq.h>

Bjorn Helgaas (5):
PCI: altera-msi: Include <linux/irqdomain.h> explicitly
PCI: microchip: Include <linux/irqdomain.h> explicitly
PCI: mvebu: Include <linux/irqdomain.h> explicitly
PCI: xgene-msi: Include <linux/irqdomain.h> explicitly
PCI: Remove unnecessary <linux/of_irq.h> includes

 drivers/pci/controller/cadence/pci-j721e.c   | 1 -
 drivers/pci/controller/dwc/pci-layerscape.c  | 1 -
 drivers/pci/controller/dwc/pcie-armada8k.c   | 1 -
 drivers/pci/controller/dwc/pcie-tegra194.c   | 1 -
 drivers/pci/controller/pci-mvebu.c           | 1 +
 drivers/pci/controller/pci-v3-semi.c         | 1 -
 drivers/pci/controller/pci-xgene-msi.c       | 2 +-
 drivers/pci/controller/pci-xgene.c           | 1 -
 drivers/pci/controller/pcie-altera-msi.c     | 2 +-
 drivers/pci/controller/pcie-iproc-platform.c | 1 -
 drivers/pci/controller/pcie-iproc.c          | 1 -
 drivers/pci/controller/pcie-microchip-host.c | 2 +-
 drivers/pci/controller/pcie-rockchip-host.c  | 1 -
 drivers/pci/controller/pcie-xilinx-cpm.c     | 1 -
 drivers/pci/controller/pcie-xilinx-nwl.c     | 1 -
 15 files changed, 4 insertions(+), 14 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v3 1/5 PCI: altera-msi: Include <linux/irqdomain.h> explicitly

From: Bjorn Helgaas <[email protected]>

pcie-altera-msi.c uses irq_domain_add_linear() and related interfaces, so it needs <linux/irqdomain.h> but doesn't include it directly; it relies on the fact that <linux/of_irq.h> includes it.

But pcie-altera-msi.c *doesn't* need <linux/of_irq.h> itself. Include <linux/irqdomain.h> directly to remove this implicit dependency so a future patch can drop <linux/of_irq.h>.

---
 drivers/pci/controller/pcie-altera-msi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/pcie-altera-msi.c +1 -0
index 7b1d3ebc34ec..4366e042e98b 100644
@@ -9,6 +9,7 @@
 
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/msi.h>
Signature · 1 line
2.25.1
#2 lore raw

PATCH v3 2/5 PCI: microchip: Include <linux/irqdomain.h> explicitly

In reply to Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

pcie-microchip-host.c uses irq_domain_add_linear() and related interfaces, so it needs <linux/irqdomain.h> but doesn't include it directly; it relies on the fact that <linux/of_irq.h> includes it.

But pcie-microchip-host.c *doesn't* need <linux/of_irq.h> itself. Include <linux/irqdomain.h> directly to remove this implicit dependency so a future patch can drop <linux/of_irq.h>.

---
 drivers/pci/controller/pcie-microchip-host.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/pcie-microchip-host.c +1 -0
index 7263d175b5ad..57b2a62f52c8 100644
@@ -9,6 +9,7 @@
 
 #include <linux/clk.h>
 #include <linux/irqchip/chained_irq.h>
+#include <linux/irqdomain.h>
 #include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
Signature · 1 line
2.25.1
#3 lore raw

PATCH v3 3/5 PCI: mvebu: Include <linux/irqdomain.h> explicitly

In reply to Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

pci-mvebu.c uses irq_domain_add_linear() and related interfaces but relies on <linux/irqdomain.h> but doesn't include it directly; it relies on the fact that <linux/of_irq.h> includes it.

Include <linux/irqdomain.h> directly to remove this implicit dependency.

---
 drivers/pci/controller/pci-mvebu.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/pci-mvebu.c +1 -0
index 1ced73726a26..73db99035c2b 100644
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
+#include <linux/irqdomain.h>
 #include <linux/mbus.h>
 #include <linux/slab.h>
 #include <linux/platform_device.h>
Signature · 1 line
2.25.1
#4 lore raw

PATCH v3 4/5 PCI: xgene-msi: Include <linux/irqdomain.h> explicitly

In reply to Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

pci-xgene-msi.c uses irq_domain_add_linear() and related interfaces, so it needs <linux/irqdomain.h> but doesn't include it directly; it relies on the fact that <linux/of_irq.h> includes it.

But pci-xgene-msi.c *doesn't* need <linux/of_irq.h> itself. Include <linux/irqdomain.h> directly to remove this implicit dependency so a future patch can drop <linux/of_irq.h>.

---
 drivers/pci/controller/pci-xgene-msi.c | 1 +
 1 file changed, 1 insertion(+)
drivers/pci/controller/pci-xgene-msi.c +1 -0
index bfa259781b69..bacb14e558ee 100644
@@ -8,6 +8,7 @@
  */
 #include <linux/cpu.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
 #include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_irq.h>
Signature · 1 line
2.25.1
#5 lore raw

PATCH v3 5/5 PCI: Remove unnecessary <linux/of_irq.h> includes

In reply to Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Many host controller drivers #include <linux/of_irq.h> even though they don't need it. Remove the unnecessary #includes.

---
 drivers/pci/controller/cadence/pci-j721e.c   | 1 -
 drivers/pci/controller/dwc/pci-layerscape.c  | 1 -
 drivers/pci/controller/dwc/pcie-armada8k.c   | 1 -
 drivers/pci/controller/dwc/pcie-tegra194.c   | 1 -
 drivers/pci/controller/pci-v3-semi.c         | 1 -
 drivers/pci/controller/pci-xgene-msi.c       | 1 -
 drivers/pci/controller/pci-xgene.c           | 1 -
 drivers/pci/controller/pcie-altera-msi.c     | 1 -
 drivers/pci/controller/pcie-iproc-platform.c | 1 -
 drivers/pci/controller/pcie-iproc.c          | 1 -
 drivers/pci/controller/pcie-microchip-host.c | 1 -
 drivers/pci/controller/pcie-rockchip-host.c  | 1 -
 drivers/pci/controller/pcie-xilinx-cpm.c     | 1 -
 drivers/pci/controller/pcie-xilinx-nwl.c     | 1 -
 14 files changed, 14 deletions(-)
drivers/pci/controller/cadence/pci-j721e.c +0 -1
index a82f845cc4b5..cc83a8925ce0 100644
@@ -15,7 +15,6 @@
 #include <linux/mfd/syscon.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/pci.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
drivers/pci/controller/dwc/pci-layerscape.c +0 -1
index 879b8692f96a..ed5fb492fe08 100644
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/of_pci.h>
 #include <linux/of_platform.h>
-#include <linux/of_irq.h>
 #include <linux/of_address.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
drivers/pci/controller/dwc/pcie-armada8k.c +0 -1
index dc469ef8e99b..5c999e15c357 100644
@@ -21,7 +21,6 @@
 #include <linux/platform_device.h>
 #include <linux/resource.h>
 #include <linux/of_pci.h>
-#include <linux/of_irq.h>
 
 #include "pcie-designware.h"
 
drivers/pci/controller/dwc/pcie-tegra194.c +0 -1
index 1b6b437823d2..02d78a12b6e7 100644
@@ -21,7 +21,6 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
-#include <linux/of_irq.h>
 #include <linux/of_pci.h>
 #include <linux/pci.h>
 #include <linux/phy/phy.h>
drivers/pci/controller/pci-v3-semi.c +0 -1
index 154a5398633c..784fcf35599c 100644
@@ -22,7 +22,6 @@
 #include <linux/kernel.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/of_pci.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
drivers/pci/controller/pci-xgene-msi.c +0 -1
index bacb14e558ee..d7987b281f79 100644
@@ -11,7 +11,6 @@
 #include <linux/irqdomain.h>
 #include <linux/module.h>
 #include <linux/msi.h>
-#include <linux/of_irq.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
drivers/pci/controller/pci-xgene.c +0 -1
index 549d3bd6d1c2..887b4941ff32 100644
@@ -14,7 +14,6 @@
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_irq.h>
 #include <linux/of_pci.h>
 #include <linux/pci.h>
 #include <linux/pci-acpi.h>
drivers/pci/controller/pcie-altera-msi.c +0 -1
index 4366e042e98b..65e8a20cc442 100644
@@ -14,7 +14,6 @@
 #include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
-#include <linux/of_irq.h>
 #include <linux/of_pci.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
drivers/pci/controller/pcie-iproc-platform.c +0 -1
index 538115246c79..4142a73e611d 100644
@@ -12,7 +12,6 @@
 #include <linux/platform_device.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
-#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 
drivers/pci/controller/pcie-iproc.c +0 -1
index 2519201b0e51..83029bdfd884 100644
@@ -18,7 +18,6 @@
 #include <linux/platform_device.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
-#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 
drivers/pci/controller/pcie-microchip-host.c +0 -1
index 57b2a62f52c8..0ebf7015e9af 100644
@@ -13,7 +13,6 @@
 #include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
-#include <linux/of_irq.h>
 #include <linux/of_pci.h>
 #include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
drivers/pci/controller/pcie-rockchip-host.c +0 -1
index 7352b5ff8d35..c96c0f454570 100644
@@ -28,7 +28,6 @@
 #include <linux/of_device.h>
 #include <linux/of_pci.h>
 #include <linux/of_platform.h>
-#include <linux/of_irq.h>
 #include <linux/pci.h>
 #include <linux/pci_ids.h>
 #include <linux/phy/phy.h>
drivers/pci/controller/pcie-xilinx-cpm.c +0 -1
index e4ab48041eb6..4a787a941674 100644
@@ -16,7 +16,6 @@
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
 #include <linux/of_platform.h>
-#include <linux/of_irq.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/pci-ecam.h>
drivers/pci/controller/pcie-xilinx-nwl.c +0 -1
index 40d070e54ad2..f0271b6c6f8d 100644
@@ -17,7 +17,6 @@
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
 #include <linux/of_platform.h>
-#include <linux/of_irq.h>
 #include <linux/pci.h>
 #include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
Signature · 1 line
2.25.1
maintainer Acked-by on v3 5/5
#6 lore raw
Quoted 11 lines

-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Subject: [PATCH v3 5/5] PCI: Remove unnecessary <linux/of_irq.h> includes

From: Bjorn Helgaas <[email protected]>

Many host controller drivers #include <linux/of_irq.h> even though they don't need it. Remove the unnecessary #includes.

Quoted 16 lines
---
 drivers/pci/controller/cadence/pci-j721e.c   | 1 -
 drivers/pci/controller/dwc/pci-layerscape.c  | 1 -
 drivers/pci/controller/dwc/pcie-armada8k.c   | 1 -
 drivers/pci/controller/dwc/pcie-tegra194.c   | 1 -
 drivers/pci/controller/pci-v3-semi.c         | 1 -
 drivers/pci/controller/pci-xgene-msi.c       | 1 -
 drivers/pci/controller/pci-xgene.c           | 1 -
 drivers/pci/controller/pcie-altera-msi.c     | 1 -
 drivers/pci/controller/pcie-iproc-platform.c | 1 -
 drivers/pci/controller/pcie-iproc.c          | 1 -
 drivers/pci/controller/pcie-microchip-host.c | 1 -  drivers/pci/controller/pcie-
rockchip-host.c  | 1 -
 drivers/pci/controller/pcie-xilinx-cpm.c     | 1 -
 drivers/pci/controller/pcie-xilinx-nwl.c     | 1 -
 14 files changed, 14 deletions(-)

-R

#7 lore raw
In reply to Bjorn Helgaas
Quoted 32 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Many host controller drivers #include <linux/of_irq.h> even though they don't need it. Remove the unnecessary #includes.

v2: https://lore.kernel.org/r/[email protected]/
v1: https://lore.kernel.org/r/[email protected]/

Changes from v2 to v3:
- Include <linux/irqdomain.h> explicitly in xgene-msi, which doesn't need <linux/of_irq.h> itself, but relied on it to include <linux/irqdomain.h>. On x86, this was covered up by the fact that <linux/msi.h> includes <asm/msi.h>, which includes <asm/irqdomain.h>, which includes <linux/irqdomain.h>. But on parisc, <asm/msi.h> is actually asm-generic/msi.h, which does *not* include <linux/irqdomain.h>
- Pick up tags from Conor Dooley and Thomas Petazzoni

Changes from v1 to v2:
- Include <linux/irqdomain.h> explicitly in altera-msi and microchip, which don't need <linux/of_irq.h> itself, but relied on it to include <linux/irqdomain.h>
- Include <linux/irqdomain.h> explicitly in mvebu, which needs both it and <linux/of_irq.h>

Bjorn Helgaas (5):
PCI: altera-msi: Include <linux/irqdomain.h> explicitly
PCI: microchip: Include <linux/irqdomain.h> explicitly
PCI: mvebu: Include <linux/irqdomain.h> explicitly
PCI: xgene-msi: Include <linux/irqdomain.h> explicitly
PCI: Remove unnecessary <linux/of_irq.h> includes

Quoted 16 lines
 drivers/pci/controller/cadence/pci-j721e.c   | 1 -
 drivers/pci/controller/dwc/pci-layerscape.c  | 1 -
 drivers/pci/controller/dwc/pcie-armada8k.c   | 1 -
 drivers/pci/controller/dwc/pcie-tegra194.c   | 1 -
 drivers/pci/controller/pci-mvebu.c           | 1 +
 drivers/pci/controller/pci-v3-semi.c         | 1 -
 drivers/pci/controller/pci-xgene-msi.c       | 2 +-
 drivers/pci/controller/pci-xgene.c           | 1 -
 drivers/pci/controller/pcie-altera-msi.c     | 2 +-
 drivers/pci/controller/pcie-iproc-platform.c | 1 -
 drivers/pci/controller/pcie-iproc.c          | 1 -
 drivers/pci/controller/pcie-microchip-host.c | 2 +-
 drivers/pci/controller/pcie-rockchip-host.c  | 1 -
 drivers/pci/controller/pcie-xilinx-cpm.c     | 1 -
 drivers/pci/controller/pcie-xilinx-nwl.c     | 1 -
 15 files changed, 4 insertions(+), 14 deletions(-)

I put these on a pci/kbuild branch that I propose to merge in after everything else. Lorenzo, let me know if you prefer another approach.

Bjorn

reviewer
#8 lore raw
In reply to Bjorn Helgaas
Quoted 5 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Many host controller drivers #include <linux/of_irq.h> even though they don't need it. Remove the unnecessary #includes.

Note that the same is often true of the other of_*.h headers.

of_device.h and of_platform.h are tricky though as one includes the other (with a decade old comment to fix). I started down that rabbit hole once...

Rob