From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: linux-kernel@vger.kernel.org, David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org, Sean Paul <sean@poorly.run>
Subject: Re: [PATCH] drm/crc-debugfs: fix crtc_crc_poll()'s return type
Date: Wed, 20 Nov 2019 12:21:03 +0200 [thread overview]
Message-ID: <20191120102103.GD1208@intel.com> (raw)
In-Reply-To: <20191120000754.30710-1-luc.vanoostenryck@gmail.com>
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@linux.intel.com>
> CC: Maxime Ripard <mripard@kernel.org>
> CC: Sean Paul <sean@poorly.run>
> CC: David Airlie <airlied@linux.ie>
> CC: Daniel Vetter <daniel@ffwll.ch>
> CC: dri-devel@lists.freedesktop.org
> Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
> ---
> 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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel
prev parent reply other threads:[~2019-11-20 10:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 0:07 Luc Van Oostenryck
2019-11-20 10:21 ` Ville Syrjälä [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191120102103.GD1208@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luc.vanoostenryck@gmail.com \
--cc=sean@poorly.run \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome