diff options
author | Robin Murphy <robin.murphy@arm.com> | 2016-09-14 16:01:24 +0100 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2016-09-15 08:35:56 -0500 |
commit | f94277af03ead0d3bf24a190a44d2b4cd6016549 (patch) | |
tree | bb7c7a0b00e856f8667f4678a5cfb92c7d0636b4 /drivers/of | |
parent | a67e9472da423ec47a3586920b526ebaedf25fc3 (diff) | |
download | linux-stable-f94277af03ead0d3bf24a190a44d2b4cd6016549.tar.gz linux-stable-f94277af03ead0d3bf24a190a44d2b4cd6016549.tar.bz2 linux-stable-f94277af03ead0d3bf24a190a44d2b4cd6016549.zip |
of/platform: Initialise dev->fwnode appropriately
Whilst we're some of the way towards a universal firmware property
interface, drivers which deal with both OF and ACPI probing end up
having to do things like this:
dev->of_node ? &dev->of_node->fwnode : dev->fwnode
This seems unnecessary, when the OF code could instead simply fill in
the device's fwnode when binding the of_node, and let the drivers use
dev->fwnode either way. Let's give it a go and see what falls out.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
-rw-r--r-- | drivers/of/platform.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index f39ccd5aa701..f811d2796437 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -142,6 +142,7 @@ struct platform_device *of_device_alloc(struct device_node *np, } dev->dev.of_node = of_node_get(np); + dev->dev.fwnode = &np->fwnode; dev->dev.parent = parent ? : &platform_bus; if (bus_id) @@ -241,6 +242,7 @@ static struct amba_device *of_amba_device_create(struct device_node *node, /* setup generic device info */ dev->dev.of_node = of_node_get(node); + dev->dev.fwnode = &node->fwnode; dev->dev.parent = parent ? : &platform_bus; dev->dev.platform_data = platform_data; if (bus_id) |