diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-01-31 13:36:22 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-02-03 07:12:54 -0500 |
| commit | f627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e (patch) | |
| tree | dd4b94a3b6d7b7c668750e647a18ac165b4290de | |
| parent | fad06016433bb1e890ce7d170079351099518489 (diff) | |
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>
| -rw-r--r-- | drivers/ata/libahci_platform.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index 077c7a261354..d89305d289f6 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) | |||
| 418 | if (child_nodes) { | 418 | if (child_nodes) { |
| 419 | for_each_child_of_node(dev->of_node, child) { | 419 | for_each_child_of_node(dev->of_node, child) { |
| 420 | u32 port; | 420 | u32 port; |
| 421 | struct platform_device *port_dev; | 421 | struct platform_device *port_dev __maybe_unused; |
| 422 | 422 | ||
| 423 | if (!of_device_is_available(child)) | 423 | if (!of_device_is_available(child)) |
| 424 | continue; | 424 | continue; |
| @@ -434,6 +434,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev) | |||
| 434 | } | 434 | } |
| 435 | mask_port_map |= BIT(port); | 435 | mask_port_map |= BIT(port); |
| 436 | 436 | ||
| 437 | #ifdef CONFIG_OF_ADDRESS | ||
| 437 | of_platform_device_create(child, NULL, NULL); | 438 | of_platform_device_create(child, NULL, NULL); |
| 438 | 439 | ||
| 439 | port_dev = of_find_device_by_node(child); | 440 | port_dev = of_find_device_by_node(child); |
| @@ -444,6 +445,7 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev) | |||
| 444 | if (rc == -EPROBE_DEFER) | 445 | if (rc == -EPROBE_DEFER) |
| 445 | goto err_out; | 446 | goto err_out; |
| 446 | } | 447 | } |
| 448 | #endif | ||
| 447 | 449 | ||
| 448 | rc = ahci_platform_get_phy(hpriv, port, dev, child); | 450 | rc = ahci_platform_get_phy(hpriv, port, dev, child); |
| 449 | if (rc) | 451 | if (rc) |
