Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3664638pxf; Mon, 29 Mar 2021 08:13:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwON9VAdUkFkyfMDJh5/hf+J+o37KOXdZUa89q2WP52y0N8G35cI9FQwZAcBh3Aig28dB9U X-Received: by 2002:a17:906:7a0b:: with SMTP id d11mr16891599ejo.113.1617030823198; Mon, 29 Mar 2021 08:13:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617030823; cv=none; d=google.com; s=arc-20160816; b=b6YikkU3ehWNE6B/ryBRWaCCjXo9y7HS9Waglrj7Ji9X/NCXwmUD+tVNKVX9zQSCAO tgJxHyKJCTtSoB7YpUJp7pDA8Y1SB+vOkPBbxroujVHsss8MlK7PewqiUbg8yWFz8ViN kqjO+C5yt54iWUd1zG4qxEo/QmUiskBky+4r/eZ2wlFEZKDArwOmZnDIea3VJY+8CMq/ bzYPEt+h6//FdufSsKULs+AYvZjy0yE7tTCJeHh1Mjc6c+QrMb+7mMOEQgweL81b9JBX EVZBWKyi0KJjxBPP9pqTYIHRAJ2yNxfJNMj8Kt9oSYdaQTwSkRfPJWWSFoloUGvsp8HW s2gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=nvy1r7eb5h+gTWQLvRzxpF1642WAjtnr91HxsrFuZgg=; b=sB1DkgVqG9V0mG/p/oD2GdA8jt0oQ1LKqfxFspnN592z3I99ZiVBFiZEaD5XxzugLQ zXWJ7rjRIDGgLtWSmsAROe4fJGKplJ6/X0gXa6sFMCLO+oFPHe0QxJCktzEGEFmx2Zfc xN30N1aIFaWt3ePWtS+XuoRi4Uzcd/jC6zXhJ/PUqBLl4wHx86wv9Vq5bniWlF2b5XH+ nXXt30gtpmHxnyLloQGRxfFr9SbNLEYeh7NaaOv/06dxA/gACSWAsByAJVT0zAZZa43h jvt6mJExzGYH/MM0JToHa7XQzB+8qvI2sMUoWjMKVtck961vH5rrSqsUrNZWNQmBbSRf 2kAA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jl16si13955681ejc.330.2021.03.29.08.13.20; Mon, 29 Mar 2021 08:13:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231184AbhC2PMW (ORCPT + 99 others); Mon, 29 Mar 2021 11:12:22 -0400 Received: from mga05.intel.com ([192.55.52.43]:63003 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230509AbhC2PMD (ORCPT ); Mon, 29 Mar 2021 11:12:03 -0400 IronPort-SDR: Msw486+b8kYvj1vY4O00IAkiLW6hD0cEKdX6ZPHXa1Ke6u0hupp8+GSnNIui8YPCQszOi9Nl21 yrzIaaTT11Dw== X-IronPort-AV: E=McAfee;i="6000,8403,9938"; a="276730833" X-IronPort-AV: E=Sophos;i="5.81,288,1610438400"; d="scan'208";a="276730833" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2021 08:12:01 -0700 IronPort-SDR: rkAxvX2hWv9+KoyuUe4QRVZON4H5njE4hMMLCPlpYpo4Q7kmQ4ro97BiugaF1DE5fTH13auW/n y9OTK8vmd6YA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,288,1610438400"; d="scan'208";a="383599170" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 29 Mar 2021 08:11:58 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 0AAA1F2; Mon, 29 Mar 2021 18:12:13 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Daniel Scally , linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-acpi@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Yong Zhi , Sakari Ailus , Bingbu Cao , Tianshu Qiu , Mauro Carvalho Chehab , Heikki Krogerus Subject: [PATCH v2 2/6] software node: Introduce software_node_alloc()/software_node_free() Date: Mon, 29 Mar 2021 18:12:03 +0300 Message-Id: <20210329151207.36619-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210329151207.36619-1-andriy.shevchenko@linux.intel.com> References: <20210329151207.36619-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce software_node_alloc() and software_node_free() helpers. This will help with code readability and maintenance. Signed-off-by: Andy Shevchenko --- v2: no changes drivers/base/swnode.c | 47 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index 456f5fe58b58..19aa44bc2628 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -720,19 +720,30 @@ software_node_find_by_name(const struct software_node *parent, const char *name) } EXPORT_SYMBOL_GPL(software_node_find_by_name); -static int -software_node_register_properties(struct software_node *node, - const struct property_entry *properties) +static struct software_node *software_node_alloc(const struct property_entry *properties) { struct property_entry *props; + struct software_node *node; props = property_entries_dup(properties); if (IS_ERR(props)) - return PTR_ERR(props); + return ERR_CAST(props); + + node = kzalloc(sizeof(*node), GFP_KERNEL); + if (!node) { + property_entries_free(props); + return ERR_PTR(-ENOMEM); + } node->properties = props; - return 0; + return node; +} + +static void software_node_free(const struct software_node *node) +{ + property_entries_free(node->properties); + kfree(node); } static void software_node_release(struct kobject *kobj) @@ -746,10 +757,9 @@ static void software_node_release(struct kobject *kobj) ida_simple_remove(&swnode_root_ids, swnode->id); } - if (swnode->allocated) { - property_entries_free(swnode->node->properties); - kfree(swnode->node); - } + if (swnode->allocated) + software_node_free(swnode->node); + ida_destroy(&swnode->child_ids); kfree(swnode); } @@ -964,7 +974,6 @@ fwnode_create_software_node(const struct property_entry *properties, struct fwnode_handle *fwnode; struct software_node *node; struct swnode *p = NULL; - int ret; if (parent) { if (IS_ERR(parent)) @@ -974,23 +983,15 @@ fwnode_create_software_node(const struct property_entry *properties, p = to_swnode(parent); } - node = kzalloc(sizeof(*node), GFP_KERNEL); - if (!node) - return ERR_PTR(-ENOMEM); - - ret = software_node_register_properties(node, properties); - if (ret) { - kfree(node); - return ERR_PTR(ret); - } + node = software_node_alloc(properties); + if (IS_ERR(node)) + return ERR_CAST(node); node->parent = p ? p->node : NULL; fwnode = swnode_register(node, p, 1); - if (IS_ERR(fwnode)) { - property_entries_free(node->properties); - kfree(node); - } + if (IS_ERR(fwnode)) + software_node_free(node); return fwnode; } -- 2.30.2