Skip to content

Commit

Permalink
staging:iio:trigger core. Trivial code cleanups.
Browse files Browse the repository at this point in the history
Stop exporting functions only intended for core usage.
Return void from function which can never return anything other than 0.
Trivial stype cleanups.

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 Aug 24, 2011
1 parent 3f72395 commit cb6c89a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
5 changes: 2 additions & 3 deletions drivers/staging/iio/iio_core_trigger.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ int iio_device_register_trigger_consumer(struct iio_dev *dev_info);
* iio_device_unregister_trigger_consumer() - reverse the registration process
* @dev_info: iio_dev associated with the device that consumed the trigger
**/
int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info);
void iio_device_unregister_trigger_consumer(struct iio_dev *dev_info);

#else

Expand All @@ -36,9 +36,8 @@ static int iio_device_register_trigger_consumer(struct iio_dev *dev_info)
* iio_device_unregister_trigger_consumer() - reverse the registration process
* @dev_info: iio_dev associated with the device that consumed the trigger
**/
static int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
static void iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
{
return 0;
};

#endif /* CONFIG_TRIGGER_CONSUMER */
Expand Down
22 changes: 7 additions & 15 deletions drivers/staging/iio/industrialio-trigger.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,12 @@ static struct iio_trigger *iio_trigger_find_by_name(const char *name,
void iio_trigger_poll(struct iio_trigger *trig, s64 time)
{
int i;
if (!trig->use_count) {
if (!trig->use_count)
for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++)
if (trig->subirqs[i].enabled) {
trig->use_count++;
generic_handle_irq(trig->subirq_base + i);
}
}
}
EXPORT_SYMBOL(iio_trigger_poll);

Expand Down Expand Up @@ -322,12 +321,10 @@ static ssize_t iio_trigger_read_current(struct device *dev,
char *buf)
{
struct iio_dev *dev_info = dev_get_drvdata(dev);
int len = 0;

if (dev_info->trig)
len = sprintf(buf,
"%s\n",
dev_info->trig->name);
return len;
return sprintf(buf, "%s\n", dev_info->trig->name);
return 0;
}

/**
Expand Down Expand Up @@ -496,23 +493,18 @@ EXPORT_SYMBOL(iio_free_trigger);

int iio_device_register_trigger_consumer(struct iio_dev *dev_info)
{
int ret;
ret = sysfs_create_group(&dev_info->dev.kobj,
&iio_trigger_consumer_attr_group);
return ret;
return sysfs_create_group(&dev_info->dev.kobj,
&iio_trigger_consumer_attr_group);
}
EXPORT_SYMBOL(iio_device_register_trigger_consumer);

int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
void iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
{
/* Clean up and associated but not attached triggers references */
if (dev_info->trig)
iio_put_trigger(dev_info->trig);
sysfs_remove_group(&dev_info->dev.kobj,
&iio_trigger_consumer_attr_group);
return 0;
}
EXPORT_SYMBOL(iio_device_unregister_trigger_consumer);

int iio_triggered_ring_postenable(struct iio_dev *indio_dev)
{
Expand Down

0 comments on commit cb6c89a

Please sign in to comment.