From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.kundenserver.de ([212.227.17.24]:59903 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750844AbaI3NTp (ORCPT ); Tue, 30 Sep 2014 09:19:45 -0400 From: Arnd Bergmann To: Bjorn Helgaas Cc: Liviu Dudau , Catalin Marinas , Rob Herring , Grant Likely , devicetree@vger.kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] of/pci: add pci_pio_to_address dummy for !CONFIG_OF Date: Tue, 30 Sep 2014 15:19:05 +0200 Message-ID: <706416181.hbVGLDA3o6@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Sender: linux-pci-owner@vger.kernel.org List-ID: The pci_register_io_range() and pci_pio_to_address() were recently introduced to generalize the handling of memory mapped PCI I/O space, but they are only valid when CONFIG_OF is set, leading to a possible build error: drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_setup_window': drivers/pci/host/pcie-rcar.c:340:3: error: implicit declaration of function 'pci_pio_to_address' [-Werror=implicit-function-declaration] res_start = pci_pio_to_address(res->start); ^ drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_probe': drivers/pci/host/pcie-rcar.c:945:3: error: implicit declaration of function 'of_pci_range_to_resource' [-Werror=implicit-function-declaration] err = of_pci_range_to_resource(&range, pdev->dev.of_node, ^ cc1: some warnings being treated as errors This provides inline dummy implementations for the case that CONFIG_OF is disabled, to allow better build testing. Signed-off-by: Arnd Bergmann Fixes: 279c5dd046 ("of/pci: Add pci_register_io_range() and pci_pio_to_address()") diff --git a/include/linux/of_address.h b/include/linux/of_address.h index 7ebb877b07c2..851097aab115 100644 --- a/include/linux/of_address.h +++ b/include/linux/of_address.h @@ -71,6 +71,11 @@ static inline const __be32 *of_get_address(struct device_node *dev, int index, return NULL; } +static inline phys_addr_t pci_pio_to_address(unsigned long pio) +{ + return 0; +} + static inline int of_pci_range_parser_init(struct of_pci_range_parser *parser, struct device_node *node) { @@ -144,6 +149,12 @@ static inline const __be32 *of_get_pci_address(struct device_node *dev, { return NULL; } +static inline int of_pci_range_to_resource(struct of_pci_range *range, + struct device_node *np, + struct resource *res) +{ + return -ENOSYS; +} #endif /* CONFIG_OF_ADDRESS && CONFIG_PCI */ #endif /* __OF_ADDRESS_H */