Skip to contentSkip to conversation

PCI: provide of_pci_get_host_bridge_resources helper

PATCH In review Arnd Bergmann 4 participants 4 messages Dec 18, 2015 – Jan 8, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PCI: provide of_pci_get_host_bridge_resources helper

The pcie-rcar driver can be built for any ARM platform (for COMPILE_TEST) including those without CONFIG_OF enabled, and that results in a compile-time error:

drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_parse_request_of_pci_ranges':
drivers/pci/host/pcie-rcar.c:939:8: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, &iobase);

In order to allow compile-testing on all platforms, this adds a of_pci_get_host_bridge_resources() helper stub function that gets used when CONFIG_OF_ADDRESS is disabled. This mirrors what we do for other OF-specific functions.

Fixes 5d2917d469fa ("PCI: rcar: Convert to DT resource parsing API")
include/linux/of_pci.h +8 -0
index 2c51ee78b1c0..874d68f50a40 100644
@@ -59,6 +59,14 @@ static inline void of_pci_check_probe_only(void) { }
 int of_pci_get_host_bridge_resources(struct device_node *dev,
 			unsigned char busno, unsigned char bus_max,
 			struct list_head *resources, resource_size_t *io_base);
+#else
+static inline
+int of_pci_get_host_bridge_resources(struct device_node *dev,
+			unsigned char busno, unsigned char bus_max,
+			struct list_head *resources, resource_size_t *io_base)
+{
+	return -EINVAL;
+}
 #endif
 
 #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · Arnd Bergmann

The pcie-rcar driver can be built for any ARM platform (for COMPILE_TEST) including those without CONFIG_OF enabled, and that results in a compile-time error:

drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_parse_request_of_pci_ranges':
drivers/pci/host/pcie-rcar.c:939:8: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, &iobase);

Quoted 7 lines

In order to allow compile-testing on all platforms, this adds a of_pci_get_host_bridge_resources() helper stub function that gets used when CONFIG_OF_ADDRESS is disabled. This mirrors what we do for other OF-specific functions.

Fixes 5d2917d469fa ("PCI: rcar: Convert to DT resource parsing API")

Makes sense :)

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160104/ec54467d/attachment.sig>

Acked-by on v1 1/1
#2 lore raw
In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

The pcie-rcar driver can be built for any ARM platform (for COMPILE_TEST) including those without CONFIG_OF enabled, and that results in a compile-time error:

drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_parse_request_of_pci_ranges':
drivers/pci/host/pcie-rcar.c:939:8: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, &iobase);

Quoted 7 lines

In order to allow compile-testing on all platforms, this adds a of_pci_get_host_bridge_resources() helper stub function that gets used when CONFIG_OF_ADDRESS is disabled. This mirrors what we do for other OF-specific functions.

Fixes 5d2917d469fa ("PCI: rcar: Convert to DT resource parsing API")
Quoted 20 lines
include/linux/of_pci.h +8 -0
index 2c51ee78b1c0..874d68f50a40 100644
@@ -59,6 +59,14 @@ static inline void of_pci_check_probe_only(void) { }
 int of_pci_get_host_bridge_resources(struct device_node *dev,
 			unsigned char busno, unsigned char bus_max,
 			struct list_head *resources, resource_size_t *io_base);
+#else
+static inline
+int of_pci_get_host_bridge_resources(struct device_node *dev,
+			unsigned char busno, unsigned char bus_max,
+			struct list_head *resources, resource_size_t *io_base)
+{
+	return -EINVAL;
+}
 #endif
 
 #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
#3 lore raw
In reply to Arnd Bergmann
Quoted 8 lines · Arnd Bergmann

The pcie-rcar driver can be built for any ARM platform (for COMPILE_TEST) including those without CONFIG_OF enabled, and that results in a compile-time error:

drivers/pci/host/pcie-rcar.c: In function 'rcar_pcie_parse_request_of_pci_ranges':
drivers/pci/host/pcie-rcar.c:939:8: error: implicit declaration of function 'of_pci_get_host_bridge_resources' [-Werror=implicit-function-declaration]
err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pci->resources, &iobase);

Quoted 7 lines

In order to allow compile-testing on all platforms, this adds a of_pci_get_host_bridge_resources() helper stub function that gets used when CONFIG_OF_ADDRESS is disabled. This mirrors what we do for other OF-specific functions.

Fixes 5d2917d469fa ("PCI: rcar: Convert to DT resource parsing API")

Applied with acks from Wolfram and Simon to pci/host for v4.5, thanks!

Quoted 24 lines
include/linux/of_pci.h +8 -1
index 2c51ee78b1c0..874d68f50a40 100644
@@ -59,6 +59,14 @@ static inline void of_pci_check_probe_only(void) { }
 int of_pci_get_host_bridge_resources(struct device_node *dev,
 			unsigned char busno, unsigned char bus_max,
 			struct list_head *resources, resource_size_t *io_base);
+#else
+static inline
+int of_pci_get_host_bridge_resources(struct device_node *dev,
+			unsigned char busno, unsigned char bus_max,
+			struct list_head *resources, resource_size_t *io_base)
+{
+	return -EINVAL;
+}
 #endif
 
 #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI)
 
--

To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html