Skip to content

Commit

Permalink
staging:iio:trigger remove export of iio_trigger_find_by_name, use sy…
Browse files Browse the repository at this point in the history
…sfs_streq for matching

Trivial reorganization.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Apr 26, 2011
1 parent 67d1c1f commit f6517f2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
19 changes: 7 additions & 12 deletions drivers/staging/iio/industrialio-trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
7 changes: 0 additions & 7 deletions drivers/staging/iio/trigger.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit f6517f2

Please sign in to comment.