[PATCH v1 4/8] software node: Deduplicate code in fwnode_create_software_node()

[Andy Shevchenko]

Deduplicate conditional and assignment in fwnode_create_software_node(),
i.e. parent is checked in two out of three cases and parent software node
is assigned by to_swnode() call.

Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
---
 drivers/base/swnode.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index d7fe1a887d2d..22f81688af2c 100644
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -1100,15 +1100,14 @@ fwnode_create_software_node(const struct property_entry 
*properties,
 {
        struct fwnode_handle *fwnode;
        struct software_node *node;
-       struct swnode *p = NULL;
-
-       if (parent) {
-               if (IS_ERR(parent))
-                       return ERR_CAST(parent);
-               if (!is_software_node(parent))
-                       return ERR_PTR(-EINVAL);
-               p = to_swnode(parent);
-       }
+       struct swnode *p;
+
+       if (IS_ERR(parent))
+               return ERR_CAST(parent);
+
+       p = to_swnode(parent);
+       if (parent && !p)
+               return ERR_PTR(-EINVAL);
 
        node = software_node_alloc(properties);
        if (IS_ERR(node))
-- 
2.30.2