misc: xilinx_sdfec: fix xsdfec_poll()'s return type
Subsystems (3)
PATCH v2 1/1 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 <[email protected]>
CC Dragan Cvetic <[email protected]>
Signed-off-by Luc Van Oostenryck <[email protected]>
Acked-by Dragan Cvetic <[email protected]>
---
Greg,
Can you take this in your tree?
Thanks.
Change since v1:
- add Dragan's ack.
drivers/misc/xilinx_sdfec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/misc/xilinx_sdfec.c +5 -5
@@ -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;
Signature · 1 line
2.24.0