diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-18 12:19:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:43:02 -0500 |
commit | 77712e5fbe2e47476823f4853d756cc5ad1dfabc (patch) | |
tree | ac2f2ed4bd498a29d7a1d013cfd16765ed016295 | |
parent | 9a16a92c11e82a0a80b4847343cfb8b5c54ed6b6 (diff) |
Staging: iio: Staticise non-exported functions
Staticise a number of functions which aren't exported outside their
source files, and also add a __user annotation for the buffer in
iio_event_chrdev_read().
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/iio/industrialio-core.c | 14 | ||||
-rw-r--r-- | drivers/staging/iio/trigger_consumer.h | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index 4ff683a3df31..b456dfc8fe27 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c | |||
@@ -118,7 +118,7 @@ int iio_push_event(struct iio_dev *dev_info, | |||
118 | EXPORT_SYMBOL(iio_push_event); | 118 | EXPORT_SYMBOL(iio_push_event); |
119 | 119 | ||
120 | /* Generic interrupt line interrupt handler */ | 120 | /* Generic interrupt line interrupt handler */ |
121 | irqreturn_t iio_interrupt_handler(int irq, void *_int_info) | 121 | static irqreturn_t iio_interrupt_handler(int irq, void *_int_info) |
122 | { | 122 | { |
123 | struct iio_interrupt *int_info = _int_info; | 123 | struct iio_interrupt *int_info = _int_info; |
124 | struct iio_dev *dev_info = int_info->dev_info; | 124 | struct iio_dev *dev_info = int_info->dev_info; |
@@ -252,10 +252,10 @@ void iio_remove_event_from_list(struct iio_event_handler_list *el, | |||
252 | } | 252 | } |
253 | EXPORT_SYMBOL(iio_remove_event_from_list); | 253 | EXPORT_SYMBOL(iio_remove_event_from_list); |
254 | 254 | ||
255 | ssize_t iio_event_chrdev_read(struct file *filep, | 255 | static ssize_t iio_event_chrdev_read(struct file *filep, |
256 | char *buf, | 256 | char __user *buf, |
257 | size_t count, | 257 | size_t count, |
258 | loff_t *f_ps) | 258 | loff_t *f_ps) |
259 | { | 259 | { |
260 | struct iio_event_interface *ev_int = filep->private_data; | 260 | struct iio_event_interface *ev_int = filep->private_data; |
261 | struct iio_detected_event_list *el; | 261 | struct iio_detected_event_list *el; |
@@ -313,7 +313,7 @@ error_ret: | |||
313 | return ret; | 313 | return ret; |
314 | } | 314 | } |
315 | 315 | ||
316 | int iio_event_chrdev_release(struct inode *inode, struct file *filep) | 316 | static int iio_event_chrdev_release(struct inode *inode, struct file *filep) |
317 | { | 317 | { |
318 | struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); | 318 | struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); |
319 | struct iio_event_interface *ev_int = hand->private; | 319 | struct iio_event_interface *ev_int = hand->private; |
@@ -335,7 +335,7 @@ int iio_event_chrdev_release(struct inode *inode, struct file *filep) | |||
335 | return 0; | 335 | return 0; |
336 | } | 336 | } |
337 | 337 | ||
338 | int iio_event_chrdev_open(struct inode *inode, struct file *filep) | 338 | static int iio_event_chrdev_open(struct inode *inode, struct file *filep) |
339 | { | 339 | { |
340 | struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); | 340 | struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev); |
341 | struct iio_event_interface *ev_int = hand->private; | 341 | struct iio_event_interface *ev_int = hand->private; |
diff --git a/drivers/staging/iio/trigger_consumer.h b/drivers/staging/iio/trigger_consumer.h index a02d70b0d24a..9d52d9637777 100644 --- a/drivers/staging/iio/trigger_consumer.h +++ b/drivers/staging/iio/trigger_consumer.h | |||
@@ -27,7 +27,7 @@ int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info); | |||
27 | * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers | 27 | * iio_device_register_trigger_consumer() - set up an iio_dev to use triggers |
28 | * @dev_info: iio_dev associated with the device that will consume the trigger | 28 | * @dev_info: iio_dev associated with the device that will consume the trigger |
29 | **/ | 29 | **/ |
30 | int iio_device_register_trigger_consumer(struct iio_dev *dev_info) | 30 | static int iio_device_register_trigger_consumer(struct iio_dev *dev_info) |
31 | { | 31 | { |
32 | return 0; | 32 | return 0; |
33 | }; | 33 | }; |
@@ -36,7 +36,7 @@ int iio_device_register_trigger_consumer(struct iio_dev *dev_info) | |||
36 | * iio_device_unregister_trigger_consumer() - reverse the registration process | 36 | * iio_device_unregister_trigger_consumer() - reverse the registration process |
37 | * @dev_info: iio_dev associated with the device that consumed the trigger | 37 | * @dev_info: iio_dev associated with the device that consumed the trigger |
38 | **/ | 38 | **/ |
39 | int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info) | 39 | static int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info) |
40 | { | 40 | { |
41 | return 0; | 41 | return 0; |
42 | }; | 42 | }; |