misc: xilinx_sdfec: fix xsdfec_poll()'s return type

xsdfec_poll() is defined as returning 'unsigned int' but the
.poll method is declared as returning '__poll_t', a bitwise type.

Fix this by using the proper return type and using the EPOLL
constants instead of the POLL ones, as required for __poll_t.

CC: Derek Kiernan <derek.kiernan@xilinx.com>
CC: Dragan Cvetic <dragan.cvetic@xilinx.com>
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Acked-by: Dragan Cvetic <dragan.cvetic@xilinx.com>
Link: https://lore.kernel.org/r/20191209213655.57985-1-luc.vanoostenryck@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/xilinx_sdfec.c b/drivers/misc/xilinx_sdfec.c
index f05e1b4c2826860c03417ec46d3cf465529ef585..71bbaa56bdb5b40f9909dd6ca842934326409b67 100644 (file)
--- a/drivers/misc/xilinx_sdfec.c
+++ b/drivers/misc/xilinx_sdfec.c
@@ -1025,25 +1025,25 @@ static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd,
 }
 #endif
 
-static unsigned int xsdfec_poll(struct file *file, poll_table *wait)
+static __poll_t xsdfec_poll(struct file *file, poll_table *wait)
 {
-       unsigned int mask = 0;
+       __poll_t mask = 0;
        struct xsdfec_dev *xsdfec;
 
        xsdfec = container_of(file->private_data, struct xsdfec_dev, miscdev);
 
        if (!xsdfec)
-               return POLLNVAL | POLLHUP;
+               return EPOLLNVAL | EPOLLHUP;
 
        poll_wait(file, &xsdfec->waitq, wait);
 
        /* XSDFEC ISR detected an error */
        spin_lock_irqsave(&xsdfec->error_data_lock, xsdfec->flags);
        if (xsdfec->state_updated)
-               mask |= POLLIN | POLLPRI;
+               mask |= EPOLLIN | EPOLLPRI;
 
        if (xsdfec->stats_updated)
-               mask |= POLLIN | POLLRDNORM;
+               mask |= EPOLLIN | EPOLLRDNORM;
        spin_unlock_irqrestore(&xsdfec->error_data_lock, xsdfec->flags);
 
        return mask;