From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x2253fb3EEy633aVbLPdjwv6Md+doJFDJVEq4UYxSWkUscxoclX/najD8q2Va1C2wfqY9XhsY ARC-Seal: i=1; a=rsa-sha256; t=1516630903; cv=none; d=google.com; s=arc-20160816; b=p8BKQhzw8KSevoe1GKgdogHZ2KpXQiKNs15VZSgDYLHQI25XezxAUCrfBOqvUuGwGX gTJH7jqfdu/METmlRxPaTudu8ZQkuJdhvODH6TBW0nnscHCbnRhMavOT69lf+0p5w5hh 4DUwjrTgecCNNBjWGNL2FhwVQXEHaEBIW/wioTOpGNMcTi5ZXJjjh7gnmzw4/BPJHmnZ jmYRaiLPEkDm+dtPJEnaNTS5eOAh3TDKZqiJgyZx2ex+t+IcA48GRLDWfbjSXLeURoQi TSLF+Nq8XNDY18Toj9dQdy4xGJlOVcFhJpwgbt0DDY2bmSgdt/VvYo9UwX3IVH4drP9d ykxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=rBAnHRFFs1CYsn6Dek1TH63+5cd2wxIx0iqG+5RgkYQ=; b=rx+yeJy3+Hv/Wi4GQZc7nAg7Xrst5IJgmwpefZ76/p0RPIgMwaO4nTtYK0hVCtpZdZ HMj5Dg4pmL2Thlx0GCWuGJCqoQy3Y0tRZgFifuUiP15RBRRuIO2dR7HimqjzTFKVe0JA z2+Jl+0wtqJWewZ+E33OHSxO8jQRySdwBxxYsd9qVzuMbReKkxhLtgc7xnWQ3xKuTcDj soYJs8v1vmf32G+AlUPBbmXRqVv0FlGdce+fI5BtLirC/n6l59qx/q9Zaz7QMZT8Q/H9 GAIKjG45lqqAvMSlI+rvEk7WVVzWd2RAImoV+RY/lK5r4iXuDaYmXRF8k331ojtELqJN i12Q== 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.43 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.43 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="11637033" 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 2/2] device property: Reuse property_entry_free_data() Date: Mon, 22 Jan 2018 16:21:38 +0200 Message-Id: <20180122142138.42434-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122142138.42434-1-andriy.shevchenko@linux.intel.com> References: <20180122142138.42434-1-andriy.shevchenko@linux.intel.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590302765529142423?= X-GMAIL-MSGID: =?utf-8?q?1590302765529142423?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Reuse property_entry_free_data() in property_entry_copy_data() to make code slightly cleaner. Signed-off-by: Andy Shevchenko --- drivers/base/property.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index f369c4c612f8..d73789bef9fb 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -745,34 +745,24 @@ static int property_entry_copy_data(struct property_entry *dst, { int error; - dst->name = kstrdup(src->name, GFP_KERNEL); - if (!dst->name) - return -ENOMEM; - if (src->is_array) { - if (!src->length) { - error = -ENODATA; - goto out_free_name; - } + if (!src->length) + return -ENODATA; if (src->is_string) { error = property_copy_string_array(dst, src); if (error) - goto out_free_name; + return error; } else { dst->pointer.raw_data = kmemdup(src->pointer.raw_data, src->length, GFP_KERNEL); - if (!dst->pointer.raw_data) { - error = -ENOMEM; - goto out_free_name; - } + if (!dst->pointer.raw_data) + return -ENOMEM; } } else if (src->is_string) { dst->value.str = kstrdup(src->value.str, GFP_KERNEL); - if (!dst->value.str && src->value.str) { - error = -ENOMEM; - goto out_free_name; - } + if (!dst->value.str && src->value.str) + return -ENOMEM; } else { dst->value.raw_data = src->value.raw_data; } @@ -781,11 +771,15 @@ static int property_entry_copy_data(struct property_entry *dst, dst->is_array = src->is_array; dst->is_string = src->is_string; + dst->name = kstrdup(src->name, GFP_KERNEL); + if (!dst->name) + goto out_free_data; + return 0; -out_free_name: - kfree(dst->name); - return error; +out_free_data: + property_entry_free_data(dst); + return -ENOMEM; } /** -- 2.15.1