Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186801
b: refs/heads/master
c: 77712e5
h: refs/heads/master
i:
  186799: 7ccd547
v: v3
  • Loading branch information
Mark Brown authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 261a658 commit 72e23f0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 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: 9a16a92c11e82a0a80b4847343cfb8b5c54ed6b6
refs/heads/master: 77712e5fbe2e47476823f4853d756cc5ad1dfabc
14 changes: 7 additions & 7 deletions trunk/drivers/staging/iio/industrialio-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ int iio_push_event(struct iio_dev *dev_info,
EXPORT_SYMBOL(iio_push_event);

/* Generic interrupt line interrupt handler */
irqreturn_t iio_interrupt_handler(int irq, void *_int_info)
static irqreturn_t iio_interrupt_handler(int irq, void *_int_info)
{
struct iio_interrupt *int_info = _int_info;
struct iio_dev *dev_info = int_info->dev_info;
Expand Down Expand Up @@ -252,10 +252,10 @@ void iio_remove_event_from_list(struct iio_event_handler_list *el,
}
EXPORT_SYMBOL(iio_remove_event_from_list);

ssize_t iio_event_chrdev_read(struct file *filep,
char *buf,
size_t count,
loff_t *f_ps)
static ssize_t iio_event_chrdev_read(struct file *filep,
char __user *buf,
size_t count,
loff_t *f_ps)
{
struct iio_event_interface *ev_int = filep->private_data;
struct iio_detected_event_list *el;
Expand Down Expand Up @@ -313,7 +313,7 @@ ssize_t iio_event_chrdev_read(struct file *filep,
return ret;
}

int iio_event_chrdev_release(struct inode *inode, struct file *filep)
static int iio_event_chrdev_release(struct inode *inode, struct file *filep)
{
struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev);
struct iio_event_interface *ev_int = hand->private;
Expand All @@ -335,7 +335,7 @@ int iio_event_chrdev_release(struct inode *inode, struct file *filep)
return 0;
}

int iio_event_chrdev_open(struct inode *inode, struct file *filep)
static int iio_event_chrdev_open(struct inode *inode, struct file *filep)
{
struct iio_handler *hand = iio_cdev_to_handler(inode->i_cdev);
struct iio_event_interface *ev_int = hand->private;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/trigger_consumer.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info);
* iio_device_register_trigger_consumer() - set up an iio_dev to use triggers
* @dev_info: iio_dev associated with the device that will consume the trigger
**/
int iio_device_register_trigger_consumer(struct iio_dev *dev_info)
static int iio_device_register_trigger_consumer(struct iio_dev *dev_info)
{
return 0;
};
Expand All @@ -36,7 +36,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)
static int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
{
return 0;
};
Expand Down

0 comments on commit 72e23f0

Please sign in to comment.