From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbcAGMHU (ORCPT ); Thu, 7 Jan 2016 07:07:20 -0500 Received: from mga03.intel.com ([134.134.136.65]:8602 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753038AbcAGMHQ (ORCPT ); Thu, 7 Jan 2016 07:07:16 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,532,1444719600"; d="scan'208";a="876357489" From: Andy Shevchenko To: Tejun Heo , Linus Walleij , Dmitry Eremin-Solenikov , linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, "David S. Miller" , David Airlie , Andrew Morton , Rasmus Villemoes Cc: Andy Shevchenko Subject: [PATCH v1 2/8] device property: convert to use match_string() helper Date: Thu, 7 Jan 2016 14:06:02 +0200 Message-Id: <1452168368-75630-2-git-send-email-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1452168368-75630-1-git-send-email-andriy.shevchenko@linux.intel.com> References: <1452168368-75630-1-git-send-email-andriy.shevchenko@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new helper returns index of the mathing string in an array. We would use it here. Signed-off-by: Andy Shevchenko --- drivers/base/property.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/base/property.c b/drivers/base/property.c index c359351..f902b55 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -647,7 +647,7 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode, const char *propname, const char *string) { const char **values; - int nval, ret, i; + int nval, ret; nval = fwnode_property_read_string_array(fwnode, propname, NULL, 0); if (nval < 0) @@ -664,13 +664,7 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode, if (ret < 0) goto out; - ret = -ENODATA; - for (i = 0; i < nval; i++) { - if (!strcmp(values[i], string)) { - ret = i; - break; - } - } + ret = match_string(values, nval, string); out: kfree(values); return ret; -- 2.6.4