From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/crc-debugfs: fix crtc_crc_poll()'s return type Date: Wed, 20 Nov 2019 12:21:03 +0200 Message-ID: <20191120102103.GD1208@intel.com> References: <20191120000754.30710-1-luc.vanoostenryck@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Return-path: Content-Disposition: inline In-Reply-To: <20191120000754.30710-1-luc.vanoostenryck@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: Luc Van Oostenryck Cc: linux-kernel@vger.kernel.org, David Airlie , dri-devel@lists.freedesktop.org, Sean Paul List-Id: dri-devel@lists.freedesktop.org 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 > CC: Maxime Ripard > CC: Sean Paul > CC: David Airlie > CC: Daniel Vetter > CC: dri-devel@lists.freedesktop.org > Signed-off-by: Luc Van Oostenryck > --- > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14019C432C3 for ; Wed, 20 Nov 2019 10:21:09 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BD4742230F for ; Wed, 20 Nov 2019 10:21:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD4742230F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D0776E18F; Wed, 20 Nov 2019 10:21:08 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2DD3E6E18F for ; Wed, 20 Nov 2019 10:21:06 +0000 (UTC) X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Nov 2019 02:21:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,221,1571727600"; d="scan'208";a="215747961" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.174]) by fmsmga001.fm.intel.com with SMTP; 20 Nov 2019 02:21:03 -0800 Received: by stinkbox (sSMTP sendmail emulation); Wed, 20 Nov 2019 12:21:03 +0200 Date: Wed, 20 Nov 2019 12:21:03 +0200 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Luc Van Oostenryck Subject: Re: [PATCH] drm/crc-debugfs: fix crtc_crc_poll()'s return type Message-ID: <20191120102103.GD1208@intel.com> References: <20191120000754.30710-1-luc.vanoostenryck@gmail.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191120000754.30710-1-luc.vanoostenryck@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Sean Paul , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Message-ID: <20191120102103.rk7KlgSsY9Ja0pP-hFrpLCctuiO-R19Stt9zbYq4Ttc@z> T24gV2VkLCBOb3YgMjAsIDIwMTkgYXQgMDE6MDc6NTRBTSArMDEwMCwgTHVjIFZhbiBPb3N0ZW5y eWNrIHdyb3RlOgo+IGNydGNfY3JjX3BvbGwoKSBpcyBkZWZpbmVkIGFzIHJldHVybmluZyAndW5z aWduZWQgaW50JyBidXQgdGhlCj4gLnBvbGwgbWV0aG9kIGlzIGRlY2xhcmVkIGFzIHJldHVybmlu ZyAnX19wb2xsX3QnLCBhIGJpdHdpc2UgdHlwZS4KPiAKPiBGaXggdGhpcyBieSB1c2luZyB0aGUg cHJvcGVyIHJldHVybiB0eXBlIGFuZCB1c2luZyB0aGUgRVBPTEwKPiBjb25zdGFudHMgaW5zdGVh ZCBvZiB0aGUgUE9MTCBvbmVzLCBhcyByZXF1aXJlZCBmb3IgX19wb2xsX3QuCgpBbHJlYWR5IGZp eGVkLiAxYWIyYTk5ZWRiMzcgKCJkcm06IEZpeCByZXR1cm4gdHlwZSBvZiBjcmMgLnBvbGwoKSIp Cgo+IAo+IENDOiBNYWFydGVuIExhbmtob3JzdCA8bWFhcnRlbi5sYW5raG9yc3RAbGludXguaW50 ZWwuY29tPgo+IENDOiBNYXhpbWUgUmlwYXJkIDxtcmlwYXJkQGtlcm5lbC5vcmc+Cj4gQ0M6IFNl YW4gUGF1bCA8c2VhbkBwb29ybHkucnVuPgo+IENDOiBEYXZpZCBBaXJsaWUgPGFpcmxpZWRAbGlu dXguaWU+Cj4gQ0M6IERhbmllbCBWZXR0ZXIgPGRhbmllbEBmZndsbC5jaD4KPiBDQzogZHJpLWRl dmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwo+IFNpZ25lZC1vZmYtYnk6IEx1YyBWYW4gT29zdGVu cnljayA8bHVjLnZhbm9vc3RlbnJ5Y2tAZ21haWwuY29tPgo+IC0tLQo+ICBkcml2ZXJzL2dwdS9k cm0vZHJtX2RlYnVnZnNfY3JjLmMgfCA2ICsrKy0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMyBpbnNl cnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9k cm0vZHJtX2RlYnVnZnNfY3JjLmMgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2RlYnVnZnNfY3JjLmMK PiBpbmRleCBiZTFiN2JhOTJmZmUuLjBiYjBhYTBlYmJjYSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJz L2dwdS9kcm0vZHJtX2RlYnVnZnNfY3JjLmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vZHJtX2Rl YnVnZnNfY3JjLmMKPiBAQCAtMzM0LDE3ICszMzQsMTcgQEAgc3RhdGljIHNzaXplX3QgY3J0Y19j cmNfcmVhZChzdHJ1Y3QgZmlsZSAqZmlsZXAsIGNoYXIgX191c2VyICp1c2VyX2J1ZiwKPiAgCXJl dHVybiBMSU5FX0xFTihjcmMtPnZhbHVlc19jbnQpOwo+ICB9Cj4gIAo+IC1zdGF0aWMgdW5zaWdu ZWQgaW50IGNydGNfY3JjX3BvbGwoc3RydWN0IGZpbGUgKmZpbGUsIHBvbGxfdGFibGUgKndhaXQp Cj4gK3N0YXRpYyBfX3BvbGxfdCBjcnRjX2NyY19wb2xsKHN0cnVjdCBmaWxlICpmaWxlLCBwb2xs X3RhYmxlICp3YWl0KQo+ICB7Cj4gIAlzdHJ1Y3QgZHJtX2NydGMgKmNydGMgPSBmaWxlLT5mX2lu b2RlLT5pX3ByaXZhdGU7Cj4gIAlzdHJ1Y3QgZHJtX2NydGNfY3JjICpjcmMgPSAmY3J0Yy0+Y3Jj Owo+IC0JdW5zaWduZWQgcmV0Owo+ICsJX19wb2xsX3QgcmV0Owo+ICAKPiAgCXBvbGxfd2FpdChm aWxlLCAmY3JjLT53cSwgd2FpdCk7Cj4gIAo+ICAJc3Bpbl9sb2NrX2lycSgmY3JjLT5sb2NrKTsK PiAgCWlmIChjcmMtPnNvdXJjZSAmJiBjcnRjX2NyY19kYXRhX2NvdW50KGNyYykpCj4gLQkJcmV0 ID0gUE9MTElOIHwgUE9MTFJETk9STTsKPiArCQlyZXQgPSBFUE9MTElOIHwgRVBPTExSRE5PUk07 Cj4gIAllbHNlCj4gIAkJcmV0ID0gMDsKPiAgCXNwaW5fdW5sb2NrX2lycSgmY3JjLT5sb2NrKTsK PiAtLSAKPiAyLjI0LjAKPiAKPiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwo+IGRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKPiBkcmktZGV2ZWxAbGlzdHMuZnJl ZWRlc2t0b3Aub3JnCj4gaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwKCi0tIApWaWxsZSBTeXJqw6Rsw6QKSW50ZWwKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApk cmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Au b3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs