From b38737bdb93e1bf4abb0bd93cb0a17ddd503acec Mon Sep 17 00:00:00 2001
From: Jonathan Cameron <jic23@cam.ac.uk>
Date: Fri, 15 Apr 2011 18:55:53 +0100
Subject: [PATCH] --- yaml --- r: 249191 b: refs/heads/master c:
 f6517f22d4f6336ce37dc6b72aae4704ff872ba3 h: refs/heads/master i:   249189:
 5af654526ee74191d02b8bf54d0e017e9de929fd   249187:
 787b774e8ee7a8fd9ee89c44f916f30769b7c62e   249183:
 0a38284fd792dce7aed87a92454764b06df3dc15 v: v3

---
 [refs]                                        |  2 +-
 .../staging/iio/industrialio-trigger.c        | 19 +++++++------------
 trunk/drivers/staging/iio/trigger.h           |  7 -------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 84ef58a4a78f..3e0993805ff4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 67d1c1f4e0e591db46c0e11c731155dde18911e6
+refs/heads/master: f6517f22d4f6336ce37dc6b72aae4704ff872ba3
diff --git a/trunk/drivers/staging/iio/industrialio-trigger.c b/trunk/drivers/staging/iio/industrialio-trigger.c
index 57dd9232cf0d..714ce06f9dbc 100644
--- a/trunk/drivers/staging/iio/industrialio-trigger.c
+++ b/trunk/drivers/staging/iio/industrialio-trigger.c
@@ -151,26 +151,21 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
 }
 EXPORT_SYMBOL(iio_trigger_unregister);
 
-struct iio_trigger *iio_trigger_find_by_name(const char *name, size_t len)
+static struct iio_trigger *iio_trigger_find_by_name(const char *name,
+						    size_t len)
 {
-	struct iio_trigger *trig;
-	bool found = false;
-
-	if (len && name[len - 1] == '\n')
-		len--;
+	struct iio_trigger *trig = NULL, *iter;
 
 	mutex_lock(&iio_trigger_list_lock);
-	list_for_each_entry(trig, &iio_trigger_list, list) {
-		if (strncmp(trig->name, name, len) == 0) {
-			found = true;
+	list_for_each_entry(iter, &iio_trigger_list, list)
+		if (sysfs_streq(iter->name, name)) {
+			trig = iter;
 			break;
 		}
-	}
 	mutex_unlock(&iio_trigger_list_lock);
 
-	return found ? trig : NULL;
+	return trig;
 }
-EXPORT_SYMBOL(iio_trigger_find_by_name);
 
 void iio_trigger_poll(struct iio_trigger *trig, s64 time)
 {
diff --git a/trunk/drivers/staging/iio/trigger.h b/trunk/drivers/staging/iio/trigger.h
index 469beba3e71d..c6ab32f74c8b 100644
--- a/trunk/drivers/staging/iio/trigger.h
+++ b/trunk/drivers/staging/iio/trigger.h
@@ -76,13 +76,6 @@ ssize_t iio_trigger_read_name(struct device *dev,
 					  iio_trigger_read_name,	\
 					  NULL);
 
-/**
- * iio_trigger_find_by_name() - search global trigger list
- * @name: trigger name to search for
- * @len: trigger name string length to compare
- **/
-struct iio_trigger *iio_trigger_find_by_name(const char *name, size_t len);
-
 /**
  * iio_trigger_register() - register a trigger with the IIO core
  * @trig_info:	trigger to be registered