History

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

Bjorn Helgaas committed 3 years ago

Commit f826afe2 parents e4d741e 8610e9816 files · +6 −16Browse files

Unified · Split

16 files
  1. drivers/pci/controller/cadence/pci-j721e.c +0 −1
  2. drivers/pci/controller/dwc/pci-layerscape.c +0 −1
  3. drivers/pci/controller/dwc/pcie-armada8k.c +0 −1
  4. drivers/pci/controller/dwc/pcie-tegra194.c +0 −1
  5. drivers/pci/controller/pci-ftpci100.c +1 −1
  6. drivers/pci/controller/pci-mvebu.c +1 −0
  7. drivers/pci/controller/pci-v3-semi.c +1 −2
  8. drivers/pci/controller/pci-xgene-msi.c +1 −1
  9. drivers/pci/controller/pci-xgene.c +0 −1
  10. drivers/pci/controller/pcie-altera-msi.c +1 −1
  11. drivers/pci/controller/pcie-iproc-platform.c +0 −1
  12. drivers/pci/controller/pcie-iproc.c +0 −1
  13. drivers/pci/controller/pcie-microchip-host.c +1 −1
  14. drivers/pci/controller/pcie-rockchip-host.c +0 −1
  15. drivers/pci/controller/pcie-xilinx-cpm.c +0 −1
  16. drivers/pci/controller/pcie-xilinx-nwl.c +0 −1
drivers/pci/controller/cadence/pci-j721e.c+0−1
@@ -15,7 +15,6 @@ · 14 unmodified lines
15#include <linux/mfd/syscon.h>15#include <linux/mfd/syscon.h>
16#include <linux/of.h>16#include <linux/of.h>
17#include <linux/of_device.h>17#include <linux/of_device.h>
18#include <linux/of_irq.h>
19#include <linux/pci.h>18#include <linux/pci.h>
20#include <linux/pm_runtime.h>19#include <linux/pm_runtime.h>
21#include <linux/regmap.h>20#include <linux/regmap.h>
drivers/pci/controller/dwc/pci-layerscape.c+0−1
@@ -13,7 +13,6 @@ · 12 unmodified lines
13#include <linux/init.h>13#include <linux/init.h>
14#include <linux/of_pci.h>14#include <linux/of_pci.h>
15#include <linux/of_platform.h>15#include <linux/of_platform.h>
16#include <linux/of_irq.h>
17#include <linux/of_address.h>16#include <linux/of_address.h>
18#include <linux/pci.h>17#include <linux/pci.h>
19#include <linux/platform_device.h>18#include <linux/platform_device.h>
drivers/pci/controller/dwc/pcie-armada8k.c+0−1
@@ -21,7 +21,6 @@ · 20 unmodified lines
21#include <linux/platform_device.h>21#include <linux/platform_device.h>
22#include <linux/resource.h>22#include <linux/resource.h>
23#include <linux/of_pci.h>23#include <linux/of_pci.h>
24#include <linux/of_irq.h>
25 24
26#include "pcie-designware.h"25#include "pcie-designware.h"
27 26
drivers/pci/controller/dwc/pcie-tegra194.c+0−1
@@ -21,7 +21,6 @@ · 20 unmodified lines
21#include <linux/of.h>21#include <linux/of.h>
22#include <linux/of_device.h>22#include <linux/of_device.h>
23#include <linux/of_gpio.h>23#include <linux/of_gpio.h>
24#include <linux/of_irq.h>
25#include <linux/of_pci.h>24#include <linux/of_pci.h>
26#include <linux/pci.h>25#include <linux/pci.h>
27#include <linux/phy/phy.h>26#include <linux/phy/phy.h>
drivers/pci/controller/pci-ftpci100.c+1−1
@@ -553,7 +553,7 @@ static const struct of_device_id faraday_pci_of_match[] = { · 552 unmodified lines
553static struct platform_driver faraday_pci_driver = {553static struct platform_driver faraday_pci_driver = {
554 .driver = {554 .driver = {
555 .name = "ftpci100",555 .name = "ftpci100",
556 .of_match_table = of_match_ptr(faraday_pci_of_match),556 .of_match_table = faraday_pci_of_match,
557 .suppress_bind_attrs = true,557 .suppress_bind_attrs = true,
558 },558 },
559 .probe = faraday_pci_probe,559 .probe = faraday_pci_probe,
drivers/pci/controller/pci-mvebu.c+1−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
14#include <linux/gpio/consumer.h>14#include <linux/gpio/consumer.h>
15#include <linux/init.h>15#include <linux/init.h>
16#include <linux/irqchip/chained_irq.h>16#include <linux/irqchip/chained_irq.h>
17#include <linux/irqdomain.h>
17#include <linux/mbus.h>18#include <linux/mbus.h>
18#include <linux/slab.h>19#include <linux/slab.h>
19#include <linux/platform_device.h>20#include <linux/platform_device.h>
drivers/pci/controller/pci-v3-semi.c+1−2
@@ -22,7 +22,6 @@ · 21 unmodified lines
22#include <linux/kernel.h>22#include <linux/kernel.h>
23#include <linux/of_address.h>23#include <linux/of_address.h>
24#include <linux/of_device.h>24#include <linux/of_device.h>
25#include <linux/of_irq.h>
26#include <linux/of_pci.h>25#include <linux/of_pci.h>
27#include <linux/pci.h>26#include <linux/pci.h>
28#include <linux/platform_device.h>27#include <linux/platform_device.h>
@@ -902,7 +901,7 @@ static const struct of_device_id v3_pci_of_match[] = { · 873 unmodified lines
902static struct platform_driver v3_pci_driver = {901static struct platform_driver v3_pci_driver = {
903 .driver = {902 .driver = {
904 .name = "pci-v3-semi",903 .name = "pci-v3-semi",
905 .of_match_table = of_match_ptr(v3_pci_of_match),904 .of_match_table = v3_pci_of_match,
906 .suppress_bind_attrs = true,905 .suppress_bind_attrs = true,
907 },906 },
908 .probe = v3_pci_probe,907 .probe = v3_pci_probe,
drivers/pci/controller/pci-xgene-msi.c+1−1
@@ -8,9 +8,9 @@ · 7 unmodified lines
8 */8 */
9#include <linux/cpu.h>9#include <linux/cpu.h>
10#include <linux/interrupt.h>10#include <linux/interrupt.h>
11#include <linux/irqdomain.h>
11#include <linux/module.h>12#include <linux/module.h>
12#include <linux/msi.h>13#include <linux/msi.h>
13#include <linux/of_irq.h>
14#include <linux/irqchip/chained_irq.h>14#include <linux/irqchip/chained_irq.h>
15#include <linux/pci.h>15#include <linux/pci.h>
16#include <linux/platform_device.h>16#include <linux/platform_device.h>
drivers/pci/controller/pci-xgene.c+0−1
@@ -14,7 +14,6 @@ · 13 unmodified lines
14#include <linux/init.h>14#include <linux/init.h>
15#include <linux/of.h>15#include <linux/of.h>
16#include <linux/of_address.h>16#include <linux/of_address.h>
17#include <linux/of_irq.h>
18#include <linux/of_pci.h>17#include <linux/of_pci.h>
19#include <linux/pci.h>18#include <linux/pci.h>
20#include <linux/pci-acpi.h>19#include <linux/pci-acpi.h>
drivers/pci/controller/pcie-altera-msi.c+1−1
@@ -9,11 +9,11 @@ · 8 unmodified lines
9 9
10#include <linux/interrupt.h>10#include <linux/interrupt.h>
11#include <linux/irqchip/chained_irq.h>11#include <linux/irqchip/chained_irq.h>
12#include <linux/irqdomain.h>
12#include <linux/init.h>13#include <linux/init.h>
13#include <linux/module.h>14#include <linux/module.h>
14#include <linux/msi.h>15#include <linux/msi.h>
15#include <linux/of_address.h>16#include <linux/of_address.h>
16#include <linux/of_irq.h>
17#include <linux/of_pci.h>17#include <linux/of_pci.h>
18#include <linux/pci.h>18#include <linux/pci.h>
19#include <linux/platform_device.h>19#include <linux/platform_device.h>
drivers/pci/controller/pcie-iproc-platform.c+0−1
@@ -12,7 +12,6 @@ · 11 unmodified lines
12#include <linux/platform_device.h>12#include <linux/platform_device.h>
13#include <linux/of_address.h>13#include <linux/of_address.h>
14#include <linux/of_pci.h>14#include <linux/of_pci.h>
15#include <linux/of_irq.h>
16#include <linux/of_platform.h>15#include <linux/of_platform.h>
17#include <linux/phy/phy.h>16#include <linux/phy/phy.h>
18 17
drivers/pci/controller/pcie-iproc.c+0−1
@@ -18,7 +18,6 @@ · 17 unmodified lines
18#include <linux/platform_device.h>18#include <linux/platform_device.h>
19#include <linux/of_address.h>19#include <linux/of_address.h>
20#include <linux/of_pci.h>20#include <linux/of_pci.h>
21#include <linux/of_irq.h>
22#include <linux/of_platform.h>21#include <linux/of_platform.h>
23#include <linux/phy/phy.h>22#include <linux/phy/phy.h>
24 23
drivers/pci/controller/pcie-microchip-host.c+1−1
@@ -9,10 +9,10 @@ · 8 unmodified lines
9 9
10#include <linux/clk.h>10#include <linux/clk.h>
11#include <linux/irqchip/chained_irq.h>11#include <linux/irqchip/chained_irq.h>
12#include <linux/irqdomain.h>
12#include <linux/module.h>13#include <linux/module.h>
13#include <linux/msi.h>14#include <linux/msi.h>
14#include <linux/of_address.h>15#include <linux/of_address.h>
15#include <linux/of_irq.h>
16#include <linux/of_pci.h>16#include <linux/of_pci.h>
17#include <linux/pci-ecam.h>17#include <linux/pci-ecam.h>
18#include <linux/platform_device.h>18#include <linux/platform_device.h>
drivers/pci/controller/pcie-rockchip-host.c+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
28#include <linux/of_device.h>28#include <linux/of_device.h>
29#include <linux/of_pci.h>29#include <linux/of_pci.h>
30#include <linux/of_platform.h>30#include <linux/of_platform.h>
31#include <linux/of_irq.h>
32#include <linux/pci.h>31#include <linux/pci.h>
33#include <linux/pci_ids.h>32#include <linux/pci_ids.h>
34#include <linux/phy/phy.h>33#include <linux/phy/phy.h>
drivers/pci/controller/pcie-xilinx-cpm.c+0−1
@@ -16,7 +16,6 @@ · 15 unmodified lines
16#include <linux/of_address.h>16#include <linux/of_address.h>
17#include <linux/of_pci.h>17#include <linux/of_pci.h>
18#include <linux/of_platform.h>18#include <linux/of_platform.h>
19#include <linux/of_irq.h>
20#include <linux/pci.h>19#include <linux/pci.h>
21#include <linux/platform_device.h>20#include <linux/platform_device.h>
22#include <linux/pci-ecam.h>21#include <linux/pci-ecam.h>
drivers/pci/controller/pcie-xilinx-nwl.c+0−1
@@ -17,7 +17,6 @@ · 16 unmodified lines
17#include <linux/of_address.h>17#include <linux/of_address.h>
18#include <linux/of_pci.h>18#include <linux/of_pci.h>
19#include <linux/of_platform.h>19#include <linux/of_platform.h>
20#include <linux/of_irq.h>
21#include <linux/pci.h>20#include <linux/pci.h>
22#include <linux/pci-ecam.h>21#include <linux/pci-ecam.h>
23#include <linux/platform_device.h>22#include <linux/platform_device.h>

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t