From patchwork Wed Nov 20 00:07:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luc Van Oostenryck X-Patchwork-Id: 11253329 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 532511390 for ; Wed, 20 Nov 2019 07:41:35 +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 362A72231D for ; Wed, 20 Nov 2019 07:41:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 362A72231D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 651E56E15A; Wed, 20 Nov 2019 07:41:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id 60A316E43C for ; Wed, 20 Nov 2019 00:09:59 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id l7so26015642wrp.6 for ; Tue, 19 Nov 2019 16:09:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EH7rOnQ7g6xPGxYOwqh1Gb8uspMXNY2i4VwFx06HJEE=; b=ILM39gqS2eU79Gx9gCQKjaTsSfzc+BTkkDEh8jfUfSoQ/cMiUeAMQ8zqLMaNV7fpN6 Ke3f0+cpfQ/RInLmS6gTpxr/bb0cgsgR6zRxyel8SidDexKk2foMGgS6Px1OJaUc+Gf6 2QUTo4k8d58qggECdFsRTcBdsSOPzBO5EqIneOh7WyLuEUzFIQ0PHf07hNHY+jx1OI21 OwGQGH6d+JW8N+iTGDKWhvH+VLy6gt/ZiZLyqq0mwZLmP9og3t9t2zox0j3ZK0LMAbZo 5d4zUQOqkhvwIoNBAplPNm+UWTH9yVqQS3Q8qYxm5KWCiOyIAmob3oBaSsrcGujmCqh7 wIsg== X-Gm-Message-State: APjAAAWs8meRDaB/jszC+1nvUQZrMAOozVykvBcNgk/nZRuqnZH82MZN NmJpscqf9FunlqDzyr5wymU= X-Google-Smtp-Source: APXvYqx12mAfe3E0Nz/Y65wRQjUhBvnRjTAULFvi/WFX6XDC722MHUUyEcNbvSf+N7QNC50xlpmWBQ== X-Received: by 2002:adf:ef51:: with SMTP id c17mr134122wrp.266.1574208598025; Tue, 19 Nov 2019 16:09:58 -0800 (PST) Received: from localhost.localdomain ([2a02:a03f:40e1:9900:5dce:1599:e3b5:7d61]) by smtp.gmail.com with ESMTPSA id n23sm4907947wmc.18.2019.11.19.16.09.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2019 16:09:57 -0800 (PST) From: Luc Van Oostenryck To: linux-kernel@vger.kernel.org Subject: [PATCH] drm/crc-debugfs: fix crtc_crc_poll()'s return type Date: Wed, 20 Nov 2019 01:07:54 +0100 Message-Id: <20191120000754.30710-1-luc.vanoostenryck@gmail.com> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 20 Nov 2019 07:41:31 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=EH7rOnQ7g6xPGxYOwqh1Gb8uspMXNY2i4VwFx06HJEE=; b=dj73GC1F5Fh5Tf3zQbbpg8WiBBNCBI3GCwlAk7sbVtz/KGpA3Bl/qOtb4j1jlrwe6f WX/qK5P9zKIAHUOmL/24N9pEaD5Lu7JyQtUETJnPgfHYjuctotFxIS4pSJ1F4Fpr6pbL /xbaIUIKf5yul2X/njsqyr9urCeIa+OzqvcJs0F/wiXd54jGeB2IsjJ8OL2A7EDkwaKG Eoh9qYopGQbz6f6g6HgG5Df+9vGNlfxP0ruoOCjh3i46OYkw/YxTk8KJWq8RjMQO8Abk nVra8/gxx1XwTpeRXkdkmTnhu7Jhx8pmPBma7I5mXkYXn9XcGYq5HTvR9OMqTFxF7cQ1 23KQ== 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 , dri-devel@lists.freedesktop.org, Sean Paul , Luc Van Oostenryck Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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. 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);