On Wed, Nov 20, 2019 at 01:07:54AM +0100, Luc Van Oostenryck wrote:
> crtc_crc_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.
Already fixed. 1ab2a99edb37 ("drm: Fix return type of crc .poll()")
>
> CC: Maarten Lankhorst <maarten.lankhorst@xxxxxxxxxxxxxxx>
> CC: Maxime Ripard <mripard@xxxxxxxxxx>
> CC: Sean Paul <sean@xxxxxxxxxx>
> CC: David Airlie <airlied@xxxxxxxx>
> CC: Daniel Vetter <daniel@xxxxxxxx>
> CC: dri-devel@xxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_debugfs_crc.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugfs_crc.c
> index be1b7ba92ffe..0bb0aa0ebbca 100644
> --- a/drivers/gpu/drm/drm_debugfs_crc.c
> +++ b/drivers/gpu/drm/drm_debugfs_crc.c
> @@ -334,17 +334,17 @@ static ssize_t crtc_crc_read(struct file *filep, char __user *user_buf,
> return LINE_LEN(crc->values_cnt);
> }
>
> -static unsigned int crtc_crc_poll(struct file *file, poll_table *wait)
> +static __poll_t crtc_crc_poll(struct file *file, poll_table *wait)
> {
> struct drm_crtc *crtc = file->f_inode->i_private;
> struct drm_crtc_crc *crc = &crtc->crc;
> - unsigned ret;
> + __poll_t ret;
>
> poll_wait(file, &crc->wq, wait);
>
> spin_lock_irq(&crc->lock);
> if (crc->source && crtc_crc_data_count(crc))
> - ret = POLLIN | POLLRDNORM;
> + ret = EPOLLIN | EPOLLRDNORM;
> else
> ret = 0;
> spin_unlock_irq(&crc->lock);
> --
> 2.24.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
