Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354478
b: refs/heads/master
c: 860c9c5
h: refs/heads/master
v: v3
  • Loading branch information
Peter Meerwald authored and Jonathan Cameron committed Feb 6, 2013
1 parent 39098de commit e1a99bf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a405b00e4470b15ed062de97c4ce552d41a0a60b
refs/heads/master: 860c9c54272deaab43b40dbe416becb34abd344f
12 changes: 6 additions & 6 deletions trunk/drivers/iio/industrialio-trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void iio_trigger_notify_done(struct iio_trigger *trig)
trig->use_count--;
if (trig->use_count == 0 && trig->ops && trig->ops->try_reenable)
if (trig->ops->try_reenable(trig))
/* Missed and interrupt so launch new poll now */
/* Missed an interrupt so launch new poll now */
iio_trigger_poll(trig, 0);
}
EXPORT_SYMBOL(iio_trigger_notify_done);
Expand Down Expand Up @@ -193,15 +193,15 @@ static void iio_trigger_put_irq(struct iio_trigger *trig, int irq)
* This is not currently handled. Alternative of not enabling trigger unless
* the relevant function is in there may be the best option.
*/
/* Worth protecting against double additions?*/
/* Worth protecting against double additions? */
static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
struct iio_poll_func *pf)
{
int ret = 0;
bool notinuse
= bitmap_empty(trig->pool, CONFIG_IIO_CONSUMERS_PER_TRIGGER);

/* Prevent the module being removed whilst attached to a trigger */
/* Prevent the module from being removed whilst attached to a trigger */
__module_get(pf->indio_dev->info->driver_module);
pf->irq = iio_trigger_get_irq(trig);
ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
Expand Down Expand Up @@ -288,7 +288,7 @@ void iio_dealloc_pollfunc(struct iio_poll_func *pf)
EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc);

/**
* iio_trigger_read_current() - trigger consumer sysfs query which trigger
* iio_trigger_read_current() - trigger consumer sysfs query current trigger
*
* For trigger consumers the current_trigger interface allows the trigger
* used by the device to be queried.
Expand All @@ -305,7 +305,7 @@ static ssize_t iio_trigger_read_current(struct device *dev,
}

/**
* iio_trigger_write_current() trigger consumer sysfs set current trigger
* iio_trigger_write_current() - trigger consumer sysfs set current trigger
*
* For trigger consumers the current_trigger interface allows the trigger
* used for this device to be specified at run time based on the triggers
Expand Down Expand Up @@ -476,7 +476,7 @@ void iio_device_register_trigger_consumer(struct iio_dev *indio_dev)

void iio_device_unregister_trigger_consumer(struct iio_dev *indio_dev)
{
/* Clean up and associated but not attached triggers references */
/* Clean up an associated but not attached trigger reference */
if (indio_dev->trig)
iio_trigger_put(indio_dev->trig);
}
Expand Down

0 comments on commit e1a99bf

Please sign in to comment.