Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934266AbcKPPUd (ORCPT ); Wed, 16 Nov 2016 10:20:33 -0500 Received: from mga05.intel.com ([192.55.52.43]:49200 "EHLO mga05.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933488AbcKPPU3 (ORCPT ); Wed, 16 Nov 2016 10:20:29 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,500,1473145200"; d="scan'208";a="1060229315" Date: Wed, 16 Nov 2016 17:20:24 +0200 From: Heikki Krogerus To: Greg KH Cc: Guenter Roeck , Oliver Neukum , Felipe Balbi , Bin Gao , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: Re: [PATHCv10 1/2] usb: USB Type-C connector class Message-ID: <20161116152024.GD30235@kuha.fi.intel.com> References: <20160919111657.22127-1-heikki.krogerus@linux.intel.com> <20160919111657.22127-2-heikki.krogerus@linux.intel.com> <20161114095148.GA10306@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161114095148.GA10306@kroah.com> User-Agent: Mutt/1.7.1 (2016-10-04) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2392 Lines: 86 Hi Greg, On Mon, Nov 14, 2016 at 10:51:48AM +0100, Greg KH wrote: > > +static int sysfs_strmatch(const char * const *array, size_t n, const char *str) > > +{ > > + const char *item; > > + int index; > > + > > + for (index = 0; index < n; index++) { > > + item = array[index]; > > + if (!item) > > + break; > > + if (sysfs_streq(item, str)) > > + return index; > > + } > > + > > + return -EINVAL; > > +} > > should we make this a core sysfs function? Last question before I send v11. Is the following (the helper) OK? diff --git a/include/linux/string.h b/include/linux/string.h index 26b6f6a..5606810 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -135,6 +135,16 @@ static inline int strtobool(const char *s, bool *res) } int match_string(const char * const *array, size_t n, const char *string); +int __sysfs_strmatch(const char * const *array, size_t n, const char *string); + +/** + * sysfs_strmatch - matches given string in an array + * @a: array of strings + * @s: string to match with + * + * Helper for __sysfs_strmatch(). Calculates the size of @a automatically. + */ +#define sysfs_strmatch(a, s) __sysfs_strmatch(a, ARRAY_SIZE(a), s) #ifdef CONFIG_BINARY_PRINTF int vbin_printf(u32 *bin_buf, size_t size, const char *fmt, va_list args); diff --git a/lib/string.c b/lib/string.c index ed83562..a4fe035 100644 --- a/lib/string.c +++ b/lib/string.c @@ -656,6 +656,32 @@ int match_string(const char * const *array, size_t n, const char *string) } EXPORT_SYMBOL(match_string); +/** + * __sysfs_strmatch - matches given string in an array + * @array: array of strings + * @n: number of strings in the array or -1 for NULL terminated arrays + * @str: string to match with + * + * Returns index of @str in the @array or -EINVAL, just like match_string(). + * Uses sysfs_streq() instead of strcmp for matching. + */ +int __sysfs_strmatch(const char * const *array, size_t n, const char *str) +{ + const char *item; + int index; + + for (index = 0; index < n; index++) { + item = array[index]; + if (!item) + break; + if (!sysfs_streq(item, str)) + return index; + } + + return -EINVAL; +} +EXPORT_SYMBOL(__sysfs_strmatch); + #ifndef __HAVE_ARCH_MEMSET /** * memset - Fill a region of memory with the given value -- heikki