aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2012-08-26 08:43:00 -0400
committerJonathan Cameron <jic23@kernel.org>2012-09-03 15:26:43 -0400
commit99698b45670a37b5304d5c6a743c8e96baa9ed8f (patch)
tree9e558923bf48cc04367bac9f4eb11c015a398c7d
parentd25b3808db3a03deb12ffc0660c757b4a619f262 (diff)
iio: whitespace cleanup and removal of semicolon after functions
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/industrialio-buffer.c10
-rw-r--r--drivers/iio/industrialio-core.c2
-rw-r--r--include/linux/iio/iio.h8
-rw-r--r--include/linux/iio/trigger.h8
4 files changed, 14 insertions, 14 deletions
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 4add9bb40eeb..774891cf8139 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -422,7 +422,7 @@ ssize_t iio_buffer_store_enable(struct device *dev,
422 ret = indio_dev->setup_ops->preenable(indio_dev); 422 ret = indio_dev->setup_ops->preenable(indio_dev);
423 if (ret) { 423 if (ret) {
424 printk(KERN_ERR 424 printk(KERN_ERR
425 "Buffer not started:" 425 "Buffer not started: "
426 "buffer preenable failed\n"); 426 "buffer preenable failed\n");
427 goto error_ret; 427 goto error_ret;
428 } 428 }
@@ -431,12 +431,12 @@ ssize_t iio_buffer_store_enable(struct device *dev,
431 ret = buffer->access->request_update(buffer); 431 ret = buffer->access->request_update(buffer);
432 if (ret) { 432 if (ret) {
433 printk(KERN_INFO 433 printk(KERN_INFO
434 "Buffer not started:" 434 "Buffer not started: "
435 "buffer parameter update failed\n"); 435 "buffer parameter update failed\n");
436 goto error_ret; 436 goto error_ret;
437 } 437 }
438 } 438 }
439 /* Definitely possible for devices to support both of these.*/ 439 /* Definitely possible for devices to support both of these. */
440 if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) { 440 if (indio_dev->modes & INDIO_BUFFER_TRIGGERED) {
441 if (!indio_dev->trig) { 441 if (!indio_dev->trig) {
442 printk(KERN_INFO 442 printk(KERN_INFO
@@ -456,7 +456,7 @@ ssize_t iio_buffer_store_enable(struct device *dev,
456 ret = indio_dev->setup_ops->postenable(indio_dev); 456 ret = indio_dev->setup_ops->postenable(indio_dev);
457 if (ret) { 457 if (ret) {
458 printk(KERN_INFO 458 printk(KERN_INFO
459 "Buffer not started:" 459 "Buffer not started: "
460 "postenable failed\n"); 460 "postenable failed\n");
461 indio_dev->currentmode = previous_mode; 461 indio_dev->currentmode = previous_mode;
462 if (indio_dev->setup_ops->postdisable) 462 if (indio_dev->setup_ops->postdisable)
@@ -657,7 +657,7 @@ EXPORT_SYMBOL_GPL(iio_scan_mask_query);
657/** 657/**
658 * struct iio_demux_table() - table describing demux memcpy ops 658 * struct iio_demux_table() - table describing demux memcpy ops
659 * @from: index to copy from 659 * @from: index to copy from
660 * @to: index to copy to 660 * @to: index to copy to
661 * @length: how many bytes to copy 661 * @length: how many bytes to copy
662 * @l: list head used for management 662 * @l: list head used for management
663 */ 663 */
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 47c1ffab38ad..a288792e2d3a 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -29,7 +29,7 @@
29#include <linux/iio/sysfs.h> 29#include <linux/iio/sysfs.h>
30#include <linux/iio/events.h> 30#include <linux/iio/events.h>
31 31
32/* IDA to assign each registered device a unique id*/ 32/* IDA to assign each registered device a unique id */
33static DEFINE_IDA(iio_ida); 33static DEFINE_IDA(iio_ida);
34 34
35static dev_t iio_devt; 35static dev_t iio_devt;
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index 677e3d8105fa..057d60382eac 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -371,10 +371,10 @@ struct iio_info {
371 * scan mask is valid for the device. 371 * scan mask is valid for the device.
372 */ 372 */
373struct iio_buffer_setup_ops { 373struct iio_buffer_setup_ops {
374 int (*preenable)(struct iio_dev *); 374 int (*preenable)(struct iio_dev *);
375 int (*postenable)(struct iio_dev *); 375 int (*postenable)(struct iio_dev *);
376 int (*predisable)(struct iio_dev *); 376 int (*predisable)(struct iio_dev *);
377 int (*postdisable)(struct iio_dev *); 377 int (*postdisable)(struct iio_dev *);
378 bool (*validate_scan_mask)(struct iio_dev *indio_dev, 378 bool (*validate_scan_mask)(struct iio_dev *indio_dev,
379 const unsigned long *scan_mask); 379 const unsigned long *scan_mask);
380}; 380};
diff --git a/include/linux/iio/trigger.h b/include/linux/iio/trigger.h
index f0af2673891d..20239da1d0f7 100644
--- a/include/linux/iio/trigger.h
+++ b/include/linux/iio/trigger.h
@@ -29,7 +29,7 @@ struct iio_subirq {
29 * instances of a given device. 29 * instances of a given device.
30 **/ 30 **/
31struct iio_trigger_ops { 31struct iio_trigger_ops {
32 struct module *owner; 32 struct module *owner;
33 int (*set_trigger_state)(struct iio_trigger *trig, bool state); 33 int (*set_trigger_state)(struct iio_trigger *trig, bool state);
34 int (*try_reenable)(struct iio_trigger *trig); 34 int (*try_reenable)(struct iio_trigger *trig);
35 int (*validate_device)(struct iio_trigger *trig, 35 int (*validate_device)(struct iio_trigger *trig,
@@ -76,19 +76,19 @@ struct iio_trigger {
76static inline struct iio_trigger *to_iio_trigger(struct device *d) 76static inline struct iio_trigger *to_iio_trigger(struct device *d)
77{ 77{
78 return container_of(d, struct iio_trigger, dev); 78 return container_of(d, struct iio_trigger, dev);
79}; 79}
80 80
81static inline void iio_trigger_put(struct iio_trigger *trig) 81static inline void iio_trigger_put(struct iio_trigger *trig)
82{ 82{
83 module_put(trig->ops->owner); 83 module_put(trig->ops->owner);
84 put_device(&trig->dev); 84 put_device(&trig->dev);
85}; 85}
86 86
87static inline void iio_trigger_get(struct iio_trigger *trig) 87static inline void iio_trigger_get(struct iio_trigger *trig)
88{ 88{
89 get_device(&trig->dev); 89 get_device(&trig->dev);
90 __module_get(trig->ops->owner); 90 __module_get(trig->ops->owner);
91}; 91}
92 92
93/** 93/**
94 * iio_trigger_register() - register a trigger with the IIO core 94 * iio_trigger_register() - register a trigger with the IIO core