Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp1757877ybc; Wed, 20 Nov 2019 03:42:03 -0800 (PST) X-Google-Smtp-Source: APXvYqyLQhN73AGTbfu1m658XJ/uIdmWKQmYC5ydUa+U4NeA2o9Q56k27FvGCA9rrEGksxf+lz4o X-Received: by 2002:adf:dd10:: with SMTP id a16mr2786574wrm.213.1574250123279; Wed, 20 Nov 2019 03:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574250123; cv=none; d=google.com; s=arc-20160816; b=zXTjxo0WEbss3/jmj1TwCa9aLRi3t4SX0VTQb1gDW28K5lhx79jygSLMSXiDV1PPot JwpBOZIumyMMGugk614sp6xiWYEjpV7X9UVJN3PD2sFpMuk5C7nXpKniRzapYyG6wj2N XNqbu830Mv+/QdBADQvXKMwetu3CKL9vCtL53yt5unzY9nJN9aiWyfRv/TVh2YMqdQ3j W5wjwqQQ6PLYZSpHWQ4u7dV4f8nVN+NPTBCLWd1JwVlfVqdyBzCbXYg9Ul8r3fHG8BR2 morZPlRvwacIYMNUgu5BYg5dP9mvRuveOYfxVRRWQrLlS+et2QPXitCLbGa+12+XyikY fT+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-transfer-encoding:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=oyt12YZOI+msQiJok9yL9Pyb4+fuyBv/o/T7Etqhv18=; b=nEKWA3oTWVUeLaNKmQiLEAGLfJjw1sp3mrRXecIf2rt2o7oAuD+1GzEiHM0wW7+YpI kTJUQCZL0aLbzg9gnaA1JVR2EP5q/o0RnTawsS1oq4J/H/mnnlZWJbt1cNDX9V8UC5D6 iFJGpojbabiPXy3L8nZ6IBX2FJLcmuhKVUgj5JOOEXOMLzlMms0fnqhoV9J/JwOf6bo8 kYBLtlnPYUx9of1l0lyOe57Jd6MeA9oj8RaY8D6Ql8Jjm+g+MGkEqjoRJ/cfKFaGunKQ 42J4M0/kwpxk+gw8E2aMjF8cHg1UbAdTaTYs0HbWGpShVcFOtb7j9xW6HfDsycW38YeR mrjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c36si17941976edb.58.2019.11.20.03.41.39; Wed, 20 Nov 2019 03:42:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728529AbfKTKVH (ORCPT + 99 others); Wed, 20 Nov 2019 05:21:07 -0500 Received: from mga01.intel.com ([192.55.52.88]:65360 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727659AbfKTKVH (ORCPT ); Wed, 20 Nov 2019 05:21:07 -0500 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 Cc: linux-kernel@vger.kernel.org, David Airlie , dri-devel@lists.freedesktop.org, Sean Paul 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-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20191120000754.30710-1-luc.vanoostenryck@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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