Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1551894

[PATCHv14 1/3] lib/string: add sysfs_match_string helper

Show all headers | View raw

Make a simple helper for matching strings with sysfs
attribute files. In most parts the same as match_string(),
except sysfs_match_string() uses sysfs_streq() instead of
strcmp() for matching. This is more convenient when used
with sysfs attributes.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 include/linux/string.h | 10 ++++++++++
 lib/string.c           | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/include/linux/string.h b/include/linux/string.h
index 26b6f6a66f83..c4011b28f3d8 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_match_string(const char * const *array, size_t n, const char *s);
+
+/**
+ * sysfs_match_string - matches given string in an array
+ * @_a: array of strings
+ * @_s: string to match with
+ *
+ * Helper for __sysfs_match_string(). Calculates the size of @a automatically.
+ */
+#define sysfs_match_string(_a, _s) __sysfs_match_string(_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 ed83562a53ae..1a7d3fd52541 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_match_string - 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_match_string(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_match_string);
+
 #ifndef __HAVE_ARCH_MEMSET
 /**
  * memset - Fill a region of memory with the given value
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCHv14 0/3] USB Type-C Connector class Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-05 12:10 +0100
  [PATCHv14 1/3] lib/string: add sysfs_match_string helper Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-05 12:10 +0100
  [PATCHv14 3/3] usb: typec: add driver for Intel Whiskey Cove PMIC USB Type-C PHY Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-05 12:10 +0100
  Re: [PATCHv14 2/3] usb: USB Type-C connector class Mika Westerberg <mika.westerberg@linux.intel.com> - 2017-01-05 17:00 +0100
    Re: [PATCHv14 2/3] usb: USB Type-C connector class Greg KH <gregkh@linuxfoundation.org> - 2017-01-05 17:50 +0100
    Re: [PATCHv14 2/3] usb: USB Type-C connector class Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-06 12:10 +0100
      Re: [PATCHv14 2/3] usb: USB Type-C connector class Guenter Roeck <linux@roeck-us.net> - 2017-01-06 16:50 +0100
      Re: [PATCHv14 2/3] usb: USB Type-C connector class Oliver Neukum <oneukum@suse.com> - 2017-01-10 11:20 +0100
        Re: [PATCHv14 2/3] usb: USB Type-C connector class Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-11 09:00 +0100
          Re: [PATCHv14 2/3] usb: USB Type-C connector class Oliver Neukum <oneukum@suse.com> - 2017-01-11 10:20 +0100
  Re: [PATCHv14 2/3] usb: USB Type-C connector class Guenter Roeck <linux@roeck-us.net> - 2017-01-09 18:00 +0100
    Re: [PATCHv14 2/3] usb: USB Type-C connector class Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-10 10:00 +0100
      Re: [PATCHv14 2/3] usb: USB Type-C connector class Guenter Roeck <linux@roeck-us.net> - 2017-01-10 15:00 +0100
        Re: [PATCHv14 2/3] usb: USB Type-C connector class Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-10 15:50 +0100
          Re: [PATCHv14 2/3] usb: USB Type-C connector class Guenter Roeck <linux@roeck-us.net> - 2017-01-10 18:40 +0100
            Re: [PATCHv14 2/3] usb: USB Type-C connector class Heikki Krogerus <heikki.krogerus@linux.intel.com> - 2017-01-11 12:10 +0100

csiph-web