From 73c9342656fa610c2358ea7b867187104647f497 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Mon, 29 Mar 2021 18:12:04 +0300 Subject: software node: Deduplicate code in fwnode_create_software_node() 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. Reviewed-by: Daniel Scally Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210329151207.36619-3-andriy.shevchenko@linux.intel.com Signed-off-by: Greg Kroah-Hartman --- drivers/base/swnode.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'drivers/base/swnode.c') diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index 6906a0a7cf47..082e0b07e5c3 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -981,15 +981,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)) -- cgit v1.2.3