summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-01-31 10:36:22 -0800
committerTejun Heo <tj@kernel.org>2015-02-03 07:12:54 -0500
commitf627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e (patch)
treedd4b94a3b6d7b7c668750e647a18ac165b4290de /drivers/ata
parentfad06016433bb1e890ce7d170079351099518489 (diff)
downloadop-kernel-dev-f627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e.zip
op-kernel-dev-f627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e.tar.gz
ata: libahci: Use of_platform_device_create only if supported
of_platform_device_create does not exist if OF_ADDRESS is not configured, so limit its use accordingly. Without this fix, the sparc64:allmodconfig build fails with ERROR: "of_platform_device_create" [drivers/ata/libahci_platform.ko] undefined! Fixes: c7d7ddee7e24 ("ata: libahci: Allow using multiple regulators") Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libahci_platform.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
index 077c7a2..d89305d 100644
--- a/drivers/ata/libahci_platform.c
+++ b/drivers/ata/libahci_platform.c
@@ -418,7 +418,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
if (child_nodes) {
for_each_child_of_node(dev->of_node, child) {
u32 port;
- struct platform_device *port_dev;
+ struct platform_device *port_dev __maybe_unused;
if (!of_device_is_available(child))
continue;
@@ -434,6 +434,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
}
mask_port_map |= BIT(port);
+#ifdef CONFIG_OF_ADDRESS
of_platform_device_create(child, NULL, NULL);
port_dev = of_find_device_by_node(child);
@@ -444,6 +445,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev)
if (rc == -EPROBE_DEFER)
goto err_out;
}
+#endif
rc = ahci_platform_get_phy(hpriv, port, dev, child);
if (rc)
OpenPOWER on IntegriCloud