[PATCH 1/1] drm/amdkfd: sparse: fix incorrect type in assignment

Felix Kuehling Felix.Kuehling at amd.com
Fri Jun 26 23:39:51 UTC 2020


The correct way to implement the fops->poll callback uses EPOLL* macros.

For reference see also:
commit a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement")
commit 7a163b2195cd ("unify {de,}mangle_poll(), get rid of kernel-side POLL...")

Reported-by: kernel test robot <lkp at intel.com>
Fixes: 73b753a11ae9 ("drm/amdkfd: Provide SMI events watch")
Signed-off-by: Felix Kuehling <Felix.Kuehling at amd.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
index f3782627407f..7b348bf9df21 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c
@@ -59,13 +59,14 @@ static const struct file_operations kfd_smi_ev_fops = {
 static __poll_t kfd_smi_ev_poll(struct file *filep,
 				struct poll_table_struct *wait)
 {
-	__poll_t mask;
 	struct kfd_smi_client *client = filep->private_data;
+	__poll_t mask = 0;
 
 	poll_wait(filep, &client->wait_queue, wait);
 
 	spin_lock(&client->lock);
-	mask = kfifo_is_empty(&client->fifo) ? 0 : POLLIN | POLLRDNORM;
+	if (!kfifo_is_empty(&client->fifo))
+		mask = EPOLLIN | EPOLLRDNORM;
 	spin_unlock(&client->lock);
 
 	return mask;
-- 
2.27.0



More information about the amd-gfx mailing list