Commit cb6c89a0 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio:trigger core. Trivial code cleanups.

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: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3f72395e
...@@ -19,7 +19,7 @@ int iio_device_register_trigger_consumer(struct iio_dev *dev_info); ...@@ -19,7 +19,7 @@ int iio_device_register_trigger_consumer(struct iio_dev *dev_info);
* iio_device_unregister_trigger_consumer() - reverse the registration process * iio_device_unregister_trigger_consumer() - reverse the registration process
* @dev_info: iio_dev associated with the device that consumed the trigger * @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 #else
...@@ -36,9 +36,8 @@ static int iio_device_register_trigger_consumer(struct iio_dev *dev_info) ...@@ -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 * iio_device_unregister_trigger_consumer() - reverse the registration process
* @dev_info: iio_dev associated with the device that consumed the trigger * @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 */ #endif /* CONFIG_TRIGGER_CONSUMER */
......
...@@ -174,13 +174,12 @@ static struct iio_trigger *iio_trigger_find_by_name(const char *name, ...@@ -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) void iio_trigger_poll(struct iio_trigger *trig, s64 time)
{ {
int i; int i;
if (!trig->use_count) { if (!trig->use_count)
for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++) for (i = 0; i < CONFIG_IIO_CONSUMERS_PER_TRIGGER; i++)
if (trig->subirqs[i].enabled) { if (trig->subirqs[i].enabled) {
trig->use_count++; trig->use_count++;
generic_handle_irq(trig->subirq_base + i); generic_handle_irq(trig->subirq_base + i);
} }
}
} }
EXPORT_SYMBOL(iio_trigger_poll); EXPORT_SYMBOL(iio_trigger_poll);
...@@ -322,12 +321,10 @@ static ssize_t iio_trigger_read_current(struct device *dev, ...@@ -322,12 +321,10 @@ static ssize_t iio_trigger_read_current(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
int len = 0;
if (dev_info->trig) if (dev_info->trig)
len = sprintf(buf, return sprintf(buf, "%s\n", dev_info->trig->name);
"%s\n", return 0;
dev_info->trig->name);
return len;
} }
/** /**
...@@ -496,23 +493,18 @@ EXPORT_SYMBOL(iio_free_trigger); ...@@ -496,23 +493,18 @@ EXPORT_SYMBOL(iio_free_trigger);
int iio_device_register_trigger_consumer(struct iio_dev *dev_info) int iio_device_register_trigger_consumer(struct iio_dev *dev_info)
{ {
int ret; return sysfs_create_group(&dev_info->dev.kobj,
ret = sysfs_create_group(&dev_info->dev.kobj,
&iio_trigger_consumer_attr_group); &iio_trigger_consumer_attr_group);
return ret;
} }
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 */ /* Clean up and associated but not attached triggers references */
if (dev_info->trig) if (dev_info->trig)
iio_put_trigger(dev_info->trig); iio_put_trigger(dev_info->trig);
sysfs_remove_group(&dev_info->dev.kobj, sysfs_remove_group(&dev_info->dev.kobj,
&iio_trigger_consumer_attr_group); &iio_trigger_consumer_attr_group);
return 0;
} }
EXPORT_SYMBOL(iio_device_unregister_trigger_consumer);
int iio_triggered_ring_postenable(struct iio_dev *indio_dev) int iio_triggered_ring_postenable(struct iio_dev *indio_dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment