Commit fa4e7fc1 authored by Luc Van Oostenryck's avatar Luc Van Oostenryck Committed by Greg Kroah-Hartman

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: default avatarLuc Van Oostenryck <luc.vanoostenryck@gmail.com>
Acked-by: default avatarDragan Cvetic <dragan.cvetic@xilinx.com>
Link: https://lore.kernel.org/r/20191209213655.57985-1-luc.vanoostenryck@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6b07e89
...@@ -1025,25 +1025,25 @@ static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd, ...@@ -1025,25 +1025,25 @@ static long xsdfec_dev_compat_ioctl(struct file *file, unsigned int cmd,
} }
#endif #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; struct xsdfec_dev *xsdfec;
xsdfec = container_of(file->private_data, struct xsdfec_dev, miscdev); xsdfec = container_of(file->private_data, struct xsdfec_dev, miscdev);
if (!xsdfec) if (!xsdfec)
return POLLNVAL | POLLHUP; return EPOLLNVAL | EPOLLHUP;
poll_wait(file, &xsdfec->waitq, wait); poll_wait(file, &xsdfec->waitq, wait);
/* XSDFEC ISR detected an error */ /* XSDFEC ISR detected an error */
spin_lock_irqsave(&xsdfec->error_data_lock, xsdfec->flags); spin_lock_irqsave(&xsdfec->error_data_lock, xsdfec->flags);
if (xsdfec->state_updated) if (xsdfec->state_updated)
mask |= POLLIN | POLLPRI; mask |= EPOLLIN | EPOLLPRI;
if (xsdfec->stats_updated) if (xsdfec->stats_updated)
mask |= POLLIN | POLLRDNORM; mask |= EPOLLIN | EPOLLRDNORM;
spin_unlock_irqrestore(&xsdfec->error_data_lock, xsdfec->flags); spin_unlock_irqrestore(&xsdfec->error_data_lock, xsdfec->flags);
return mask; return mask;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment