lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 3/6] software node: Deduplicate code in fwnode_create_software_node()
    Date
    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.shevchenko@linux.intel.com>
    ---
    v2: no changes
    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 19aa44bc2628..db982859171e 100644
    --- a/drivers/base/swnode.c
    +++ b/drivers/base/swnode.c
    @@ -973,15 +973,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
    \
     
     \ /
      Last update: 2021-03-29 17:13    [W:2.499 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site