Merge tag 'regulator-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[uclinux-h8/linux.git] / drivers / iio / industrialio-event.c

diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 99ba657..7e53211 100644 (file)
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -31,6 +31,7 @@
  * @flags:             file operations related flags including busy flag.
  * @group:             event interface sysfs attribute group
  * @read_lock:         lock to protect kfifo read operations
+ * @ioctl_handler:     handler for event ioctl() calls
  */
 struct iio_event_interface {
        wait_queue_head_t       wait;
@@ -40,6 +41,7 @@ struct iio_event_interface {
        unsigned long           flags;
        struct attribute_group  group;
        struct mutex            read_lock;
+       struct iio_ioctl_handler        ioctl_handler;
 };
 
 bool iio_event_enabled(const struct iio_event_interface *ev_int)
@@ -187,7 +189,7 @@ static const struct file_operations iio_event_chrdev_fileops = {
        .llseek = noop_llseek,
 };
 
-int iio_event_getfd(struct iio_dev *indio_dev)
+static int iio_event_getfd(struct iio_dev *indio_dev)
 {
        struct iio_dev_opaque *iio_dev_opaque = to_iio_dev_opaque(indio_dev);
        struct iio_event_interface *ev_int = iio_dev_opaque->event_interface;
@@ -473,6 +475,24 @@ static void iio_setup_ev_int(struct iio_event_interface *ev_int)
        mutex_init(&ev_int->read_lock);
 }
 
+static long iio_event_ioctl(struct iio_dev *indio_dev, struct file *filp,
+                           unsigned int cmd, unsigned long arg)
+{
+       int __user *ip = (int __user *)arg;
+       int fd;
+
+       if (cmd == IIO_GET_EVENT_FD_IOCTL) {
+               fd = iio_event_getfd(indio_dev);
+               if (fd < 0)
+                       return fd;
+               if (copy_to_user(ip, &fd, sizeof(fd)))
+                       return -EFAULT;
+               return 0;
+       }
+
+       return IIO_IOCTL_UNHANDLED;
+}
+
 static const char *iio_event_group_name = "events";
 int iio_device_register_eventset(struct iio_dev *indio_dev)
 {
@@ -526,6 +546,10 @@ int iio_device_register_eventset(struct iio_dev *indio_dev)
                ev_int->group.attrs[attrn++] = &p->dev_attr.attr;
        indio_dev->groups[indio_dev->groupcounter++] = &ev_int->group;
 
+       ev_int->ioctl_handler.ioctl = iio_event_ioctl;
+       iio_device_ioctl_handler_register(&iio_dev_opaque->indio_dev,
+                                         &ev_int->ioctl_handler);
+
        return 0;
 
 error_free_setup_event_lines:
@@ -558,6 +582,8 @@ void iio_device_unregister_eventset(struct iio_dev *indio_dev)
 
        if (ev_int == NULL)
                return;
+
+       iio_device_ioctl_handler_unregister(&ev_int->ioctl_handler);
        iio_free_chan_devattr_list(&ev_int->dev_attr_list);
        kfree(ev_int->group.attrs);
        kfree(ev_int);