From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226sfyFEb0JaEjDPbQ1KE4rFyY78QAuHyUx30XYVEYncXEttJoCVcICU2JKA4fBEchkotQry ARC-Seal: i=1; a=rsa-sha256; t=1516630916; cv=none; d=google.com; s=arc-20160816; b=kMaIMmWdaHlWnQNoX91WN80yNkLexno+xRau67tnnlbluHvoFOjQ9davA2AsNRNPkz e2RS1hETlDEcsP3mckk3184hS7klAR38UPqKw/bSjwdLFwxEtYDSlmX5+iAifaig7jW9 atL9Wo6OLrcWVAjaDFT+wDGlaNpvP7x7DDWld0gNN7fKv3ZmLRad+U5H7s9FhJkck30P 6HSA4YEsFy1zRX5CPOwFz0P3HQIBYc7xGOTaPAsFcUxLv35ibrLCf6ay5nZGQbkGaMEO eiAqF2VVs1ps6ocFox22N5DCE/JuSjDfj64zkYEBzQrasAnPpIWsxTyMncXVaxPUSedf 88BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=4NWvQXBSPssIalKY1wwlPbJ97EdZCbVVu2abqH/DeZo=; b=VVfeXeT54/tk8PZtsurkIT+C/21bKqWf9xvHLC7wn3QjT3vL4XNyOJAi6klX5keG96 nWmnfZez6y5QKDc3CCZT1wCvLTWZwyptCmVjpPkrzvAMgbcCXRunhjZSOg8Ms/FwJcaJ B65+8cRSANJ398z65h7uS5DSdfLHcArFdE6V1nFRRuDJDfgk+55+y777afb2mjG4s/q8 epqXJI30HS7rcqBxc+N2AMSHhu+qiLDvvnSJICXBoRcFyHJnuEp4dpzBYqGWSBlZg1zJ R1OgxFZPqQx3wM1i7gd5q/bbywUv/mZuwD10xbEhzBjmnAS8UcmNvDafGONVYbDbrjDS iWPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of andriy.shevchenko@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=andriy.shevchenko@linux.intel.com Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of andriy.shevchenko@linux.intel.com designates 192.55.52.88 as permitted sender) smtp.mailfrom=andriy.shevchenko@linux.intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,396,1511856000"; d="scan'208";a="23689668" From: Andy Shevchenko To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org, "Rafael J. Wysocki" , Sakari Ailus , mika.westerberg@linux.intel.com Cc: Andy Shevchenko Subject: [PATCH v1 1/2] device property: Move property_entry_free_data() upper Date: Mon, 22 Jan 2018 16:21:37 +0200 Message-Id: <20180122142138.42434-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.15.1 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590302779560288560?= X-GMAIL-MSGID: =?utf-8?q?1590302779560288560?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: It's just a preparatory patch to use property_entry_free_data() later on. No functional change intended. Signed-off-by: Andy Shevchenko --- drivers/base/property.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index 851b1b6596a4..f369c4c612f8 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -698,6 +698,23 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode, } EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args); +static void property_entry_free_data(const struct property_entry *p) +{ + size_t i, nval; + + if (p->is_array) { + if (p->is_string && p->pointer.str) { + nval = p->length / sizeof(const char *); + for (i = 0; i < nval; i++) + kfree(p->pointer.str[i]); + } + kfree(p->pointer.raw_data); + } else if (p->is_string) { + kfree(p->value.str); + } + kfree(p->name); +} + static int property_copy_string_array(struct property_entry *dst, const struct property_entry *src) { @@ -771,23 +788,6 @@ static int property_entry_copy_data(struct property_entry *dst, return error; } -static void property_entry_free_data(const struct property_entry *p) -{ - size_t i, nval; - - if (p->is_array) { - if (p->is_string && p->pointer.str) { - nval = p->length / sizeof(const char *); - for (i = 0; i < nval; i++) - kfree(p->pointer.str[i]); - } - kfree(p->pointer.raw_data); - } else if (p->is_string) { - kfree(p->value.str); - } - kfree(p->name); -} - /** * property_entries_dup - duplicate array of properties * @properties: array of properties to copy -- 2.15.1