Skip to content

Commit e3ac25c

Browse files
Marc Zyngierbjorn-helgaas
authored andcommitted
PCI: xgene: Drop useless conditional compilation
pci-xgene.c only gets compiled if CONFIG_PCI_XGENE is selected. It is therefore pointless to check for CONFIG_PCI_XGENE inside the driver. Signed-off-by: Marc Zyngier <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]> Signed-off-by: Bjorn Helgaas <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 0d402bd commit e3ac25c

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

drivers/pci/controller/pci-xgene.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
#define XGENE_PCIE_IP_VER_1 1
5959
#define XGENE_PCIE_IP_VER_2 2
6060

61-
#if defined(CONFIG_PCI_XGENE) || (defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS))
6261
struct xgene_pcie {
6362
struct device_node *node;
6463
struct device *dev;
@@ -189,7 +188,6 @@ static int xgene_pcie_config_read32(struct pci_bus *bus, unsigned int devfn,
189188

190189
return PCIBIOS_SUCCESSFUL;
191190
}
192-
#endif
193191

194192
#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)
195193
static int xgene_get_csr_resource(struct acpi_device *adev,
@@ -280,7 +278,6 @@ const struct pci_ecam_ops xgene_v2_pcie_ecam_ops = {
280278
};
281279
#endif
282280

283-
#if defined(CONFIG_PCI_XGENE)
284281
static u64 xgene_pcie_set_ib_mask(struct xgene_pcie *port, u32 addr,
285282
u32 flags, u64 size)
286283
{
@@ -670,4 +667,3 @@ static struct platform_driver xgene_pcie_driver = {
670667
.probe = xgene_pcie_probe,
671668
};
672669
builtin_platform_driver(xgene_pcie_driver);
673-
#endif

0 commit comments

Comments
 (0)