procfs owns the wait queue a /proc/asound file is polled on and wakes
the pollers through proc_poll_notify(), so the poll op of an info entry
has nothing to do with the poll_table anymore and only reports the
mask. Nothing in the tree implements the op.

Signed-off-by: Christian Brauner (Amutable) <[email protected]>
---
 include/sound/info.h | 3 +--
 sound/core/info.c    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/include/sound/info.h b/include/sound/info.h
index d6cb0346f77d..327d92059f67 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -48,8 +48,7 @@ struct snd_info_entry_ops {
                         void *file_private_data, struct file *file,
                         loff_t offset, int orig);
        __poll_t (*poll)(struct snd_info_entry *entry,
-                            void *file_private_data, struct file *file,
-                            poll_table *wait);
+                            void *file_private_data, struct file *file);
        int (*mmap)(struct snd_info_entry *entry, void *file_private_data,
                    struct inode *inode, struct file *file,
                    struct vm_area_struct *vma);
diff --git a/sound/core/info.c b/sound/core/info.c
index f837cfbe7313..c8735a6ec789 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -193,7 +193,7 @@ static __poll_t snd_info_entry_poll(struct file *file, 
poll_table *wait)
        if (entry->c.ops->poll)
                return entry->c.ops->poll(entry,
                                          data->file_private_data,
-                                         file, wait);
+                                         file);
        if (entry->c.ops->read)
                mask |= EPOLLIN | EPOLLRDNORM;
        if (entry->c.ops->write)

-- 
2.53.0


Reply via email to