slimbus: core: Set fwnode for a device when setting of_node
authorSaravana Kannan <saravanak@google.com>
Mon, 11 May 2020 15:13:33 +0000 (16:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 May 2020 14:21:07 +0000 (16:21 +0200)
When setting the of_node for a newly created device, also set the
fwnode. This allows fw_devlink feature to work for slimbus devices.

Also, remove some unnecessary NULL checks. The functions in question
already do NULL checks.

Signed-off-by: Saravana Kannan <saravanak@google.com>
[Srini: removed unnecessary NULL check from other patch]
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200511151334.362-2-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/slimbus/core.c

index 526e321..1f3beee 100644 (file)
@@ -162,9 +162,8 @@ static int slim_add_device(struct slim_controller *ctrl,
        sbdev->ctrl = ctrl;
        INIT_LIST_HEAD(&sbdev->stream_list);
        spin_lock_init(&sbdev->stream_list_lock);
-
-       if (node)
-               sbdev->dev.of_node = of_node_get(node);
+       sbdev->dev.of_node = of_node_get(node);
+       sbdev->dev.fwnode = of_fwnode_handle(node);
 
        dev_set_name(&sbdev->dev, "%x:%x:%x:%x",
                                  sbdev->e_addr.manf_id,