diff options
| author | Rob Herring <robh@kernel.org> | 2021-05-27 21:45:46 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2021-06-03 03:59:29 +0200 |
| commit | c3c0dc75774b488770f33598109161040d291367 (patch) | |
| tree | 448ec0f71854c5150b658ba87b06935ff5c762e2 /drivers/of | |
| parent | of: Merge of_get_address() and of_get_pci_address() implementations (diff) | |
| download | linux-c3c0dc75774b488770f33598109161040d291367.tar.xz linux-c3c0dc75774b488770f33598109161040d291367.zip | |
of: address: Use IS_ENABLED() for !CONFIG_PCI
Convert address.c to use IS_ENABLED() instead of ifdefs for the
public PCI functions. This simplifies the ifdefs in of_address.h.
Cc: Frank Rowand <frowand.list@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210527194547.1287934-4-robh@kernel.org
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/address.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/of/address.c b/drivers/of/address.c index aa766437995c..e643f999743a 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -198,6 +198,7 @@ static int of_bus_pci_translate(__be32 *addr, u64 offset, int na) { return of_bus_default_translate(addr + 1, offset, na - 1); } +#endif /* CONFIG_PCI */ int of_pci_address_to_resource(struct device_node *dev, int bar, struct resource *r) @@ -206,6 +207,9 @@ int of_pci_address_to_resource(struct device_node *dev, int bar, u64 size; unsigned int flags; + if (!IS_ENABLED(CONFIG_PCI)) + return -ENOSYS; + addrp = of_get_pci_address(dev, bar, &size, &flags); if (addrp == NULL) return -EINVAL; @@ -236,6 +240,9 @@ int of_pci_range_to_resource(struct of_pci_range *range, res->parent = res->child = res->sibling = NULL; res->name = np->full_name; + if (!IS_ENABLED(CONFIG_PCI)) + return -ENOSYS; + if (res->flags & IORESOURCE_IO) { unsigned long port; err = pci_register_io_range(&np->fwnode, range->cpu_addr, @@ -266,7 +273,6 @@ invalid_range: return err; } EXPORT_SYMBOL(of_pci_range_to_resource); -#endif /* CONFIG_PCI */ /* * ISA bus specific translator |