OSDN Git Service

staging: fieldbus: solve warning incorrect type dev_core.c
authorOscar Gomez Fuente <oscargomezf@gmail.com>
Fri, 17 May 2019 17:49:56 +0000 (19:49 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 May 2019 07:31:46 +0000 (09:31 +0200)
These changes solve a warning realated to an incorrect type inilizer in the function
fieldbus_poll.

Signed-off-by: Oscar Gomez Fuente <oscargomezf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/fieldbus/dev_core.c

index 60b8514..f6f5b92 100644 (file)
@@ -211,16 +211,16 @@ static ssize_t fieldbus_write(struct file *filp, const char __user *buf,
        return fbdev->write_area(fbdev, buf, size, offset);
 }
 
-static unsigned int fieldbus_poll(struct file *filp, poll_table *wait)
+static __poll_t fieldbus_poll(struct file *filp, poll_table *wait)
 {
        struct fb_open_file *of = filp->private_data;
        struct fieldbus_dev *fbdev = of->fbdev;
-       unsigned int mask = POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;
+       __poll_t mask = EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM;
 
        poll_wait(filp, &fbdev->dc_wq, wait);
        /* data changed ? */
        if (fbdev->dc_event != of->dc_event)
-               mask |= POLLPRI | POLLERR;
+               mask |= EPOLLPRI | EPOLLERR;
        return mask;
 }