Skip to content

Commit f826afe

Browse files
bjorn-helgaasbjorn-helgaas
committed
Merge branch 'pci/kbuild'
- Remove unnecessary <linux/of_irq.h> includes (Bjorn Helgaas) * pci/kbuild: PCI: Drop of_match_ptr() to avoid unused variables PCI: Remove unnecessary <linux/of_irq.h> includes PCI: xgene-msi: Include <linux/irqdomain.h> explicitly PCI: mvebu: Include <linux/irqdomain.h> explicitly PCI: microchip: Include <linux/irqdomain.h> explicitly PCI: altera-msi: Include <linux/irqdomain.h> explicitly # Conflicts: # drivers/pci/controller/pci-mvebu.c
2 parents e4d741e + 8610e98 commit f826afe

16 files changed

+6
-16
lines changed

‎drivers/pci/controller/cadence/pci-j721e.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include <linux/mfd/syscon.h>
1616
#include <linux/of.h>
1717
#include <linux/of_device.h>
18-
#include <linux/of_irq.h>
1918
#include <linux/pci.h>
2019
#include <linux/pm_runtime.h>
2120
#include <linux/regmap.h>

‎drivers/pci/controller/dwc/pci-layerscape.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <linux/init.h>
1414
#include <linux/of_pci.h>
1515
#include <linux/of_platform.h>
16-
#include <linux/of_irq.h>
1716
#include <linux/of_address.h>
1817
#include <linux/pci.h>
1918
#include <linux/platform_device.h>

‎drivers/pci/controller/dwc/pcie-armada8k.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <linux/platform_device.h>
2222
#include <linux/resource.h>
2323
#include <linux/of_pci.h>
24-
#include <linux/of_irq.h>
2524

2625
#include "pcie-designware.h"
2726

‎drivers/pci/controller/dwc/pcie-tegra194.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <linux/of.h>
2222
#include <linux/of_device.h>
2323
#include <linux/of_gpio.h>
24-
#include <linux/of_irq.h>
2524
#include <linux/of_pci.h>
2625
#include <linux/pci.h>
2726
#include <linux/phy/phy.h>

‎drivers/pci/controller/pci-ftpci100.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -553,7 +553,7 @@ static const struct of_device_id faraday_pci_of_match[] = {
553553
static struct platform_driver faraday_pci_driver = {
554554
.driver = {
555555
.name = "ftpci100",
556-
.of_match_table = of_match_ptr(faraday_pci_of_match),
556+
.of_match_table = faraday_pci_of_match,
557557
.suppress_bind_attrs = true,
558558
},
559559
.probe = faraday_pci_probe,

‎drivers/pci/controller/pci-mvebu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include <linux/gpio/consumer.h>
1515
#include <linux/init.h>
1616
#include <linux/irqchip/chained_irq.h>
17+
#include <linux/irqdomain.h>
1718
#include <linux/mbus.h>
1819
#include <linux/slab.h>
1920
#include <linux/platform_device.h>

‎drivers/pci/controller/pci-v3-semi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/kernel.h>
2323
#include <linux/of_address.h>
2424
#include <linux/of_device.h>
25-
#include <linux/of_irq.h>
2625
#include <linux/of_pci.h>
2726
#include <linux/pci.h>
2827
#include <linux/platform_device.h>
@@ -902,7 +901,7 @@ static const struct of_device_id v3_pci_of_match[] = {
902901
static struct platform_driver v3_pci_driver = {
903902
.driver = {
904903
.name = "pci-v3-semi",
905-
.of_match_table = of_match_ptr(v3_pci_of_match),
904+
.of_match_table = v3_pci_of_match,
906905
.suppress_bind_attrs = true,
907906
},
908907
.probe = v3_pci_probe,

‎drivers/pci/controller/pci-xgene-msi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*/
99
#include <linux/cpu.h>
1010
#include <linux/interrupt.h>
11+
#include <linux/irqdomain.h>
1112
#include <linux/module.h>
1213
#include <linux/msi.h>
13-
#include <linux/of_irq.h>
1414
#include <linux/irqchip/chained_irq.h>
1515
#include <linux/pci.h>
1616
#include <linux/platform_device.h>

‎drivers/pci/controller/pci-xgene.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/init.h>
1515
#include <linux/of.h>
1616
#include <linux/of_address.h>
17-
#include <linux/of_irq.h>
1817
#include <linux/of_pci.h>
1918
#include <linux/pci.h>
2019
#include <linux/pci-acpi.h>

‎drivers/pci/controller/pcie-altera-msi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99

1010
#include <linux/interrupt.h>
1111
#include <linux/irqchip/chained_irq.h>
12+
#include <linux/irqdomain.h>
1213
#include <linux/init.h>
1314
#include <linux/module.h>
1415
#include <linux/msi.h>
1516
#include <linux/of_address.h>
16-
#include <linux/of_irq.h>
1717
#include <linux/of_pci.h>
1818
#include <linux/pci.h>
1919
#include <linux/platform_device.h>

0 commit comments

Comments
 (0)