->poll() methods should return __poll_t

The most common place to find POLL... bitmaps: return values
of ->poll() and its subsystem counterparts.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index 225f541f7078c937c6a4c25264069700025a0582..44e37f38493b35fa10e2694757b1a9b8e21de587 100644 (file)
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -238,7 +238,7 @@ static unsigned int proc_reg_poll(struct file *file, struct poll_table_struct *p
 {
        struct proc_dir_entry *pde = PDE(file_inode(file));
        unsigned int rv = DEFAULT_POLLMASK;
-       unsigned int (*poll)(struct file *, struct poll_table_struct *);
+       __poll_t (*poll)(struct file *, struct poll_table_struct *);
        if (use_pde(pde)) {
                poll = pde->proc_fops->poll;
                if (poll)

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2995a271ec466c54117025cf819ce65931d5166c..64695eb07992998ecfdf89d1c294a33705fee3c3 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1698,7 +1698,7 @@ struct file_operations {
        ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
        int (*iterate) (struct file *, struct dir_context *);
        int (*iterate_shared) (struct file *, struct dir_context *);
-       unsigned int (*poll) (struct file *, struct poll_table_struct *);
+       __poll_t (*poll) (struct file *, struct poll_table_struct *);
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
        int (*mmap) (struct file *, struct vm_area_struct *);

diff --git a/include/linux/net.h b/include/linux/net.h
index caeb159abda508580dfe4fa15940f36e51bdd1e8..c2d468cb98217290ba58be0b3bcd1d90d47e19ea 100644 (file)
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -147,7 +147,7 @@ struct proto_ops {
        int             (*getname)   (struct socket *sock,
                                      struct sockaddr *addr,
                                      int *sockaddr_len, int peer);
-       unsigned int    (*poll)      (struct file *file, struct socket *sock,
+       __poll_t        (*poll)      (struct file *file, struct socket *sock,
                                      struct poll_table_struct *wait);
        int             (*ioctl)     (struct socket *sock, unsigned int cmd,
                                      unsigned long arg);

diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h
index 38d8225510f153ed71f23287f841ec77bc85fcb1..3a3bc71017d503fc50f0da3196afdfba9cfbcd2f 100644 (file)
--- a/include/linux/posix-clock.h
+++ b/include/linux/posix-clock.h
@@ -68,7 +68,7 @@ struct posix_clock_operations {
 
        int     (*open)    (struct posix_clock *pc, fmode_t f_mode);
 
-       uint    (*poll)    (struct posix_clock *pc,
+       __poll_t (*poll)   (struct posix_clock *pc,
                            struct file *file, poll_table *wait);
 
        int     (*release) (struct posix_clock *pc);

diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 3bc5144b1c7eb6412223bdbf9bd0106258547875..1ef64d4ad887ea50e7fcd88707d97b033c985660 100644 (file)
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -187,7 +187,7 @@ struct tty_ldisc_ops {
        long    (*compat_ioctl)(struct tty_struct *tty, struct file *file,
                                unsigned int cmd, unsigned long arg);
        void    (*set_termios)(struct tty_struct *tty, struct ktermios *old);
-       unsigned int (*poll)(struct tty_struct *, struct file *,
+       __poll_t (*poll)(struct tty_struct *, struct file *,
                             struct poll_table_struct *);
        int     (*hangup)(struct tty_struct *tty);
 

diff --git a/include/media/media-devnode.h b/include/media/media-devnode.h
index 511615d3bf6f4310726eac73d86662534bdb2479..dc2f64e1b08f0a55253afca656a3faffd6610ae8 100644 (file)
--- a/include/media/media-devnode.h
+++ b/include/media/media-devnode.h
@@ -56,7 +56,7 @@ struct media_file_operations {
        struct module *owner;
        ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
        ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
-       unsigned int (*poll) (struct file *, struct poll_table_struct *);
+       __poll_t (*poll) (struct file *, struct poll_table_struct *);
        long (*ioctl) (struct file *, unsigned int, unsigned long);
        long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
        int (*open) (struct file *);

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 4d8cb0796bc60d637cd69a7381cb93e1318a723d..b7e42a1b09101eef82a343e3794a3bfefa45b048 100644 (file)
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -117,7 +117,7 @@ struct soc_camera_host_ops {
        int (*get_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
        int (*set_parm)(struct soc_camera_device *, struct v4l2_streamparm *);
        int (*enum_framesizes)(struct soc_camera_device *, struct v4l2_frmsizeenum *);
-       unsigned int (*poll)(struct file *, poll_table *);
+       __poll_t (*poll)(struct file *, poll_table *);
 };
 
 #define SOCAM_SENSOR_INVERT_PCLK       (1 << 0)

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 28a686eb7d090606cb0a7ab17de3ae42eea2f30a..fa99f6f66712d9158c5198e25f01267267fe24f9 100644 (file)
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -152,7 +152,7 @@ struct v4l2_file_operations {
        struct module *owner;
        ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
        ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
-       unsigned int (*poll) (struct file *, struct poll_table_struct *);
+       __poll_t (*poll) (struct file *, struct poll_table_struct *);
        long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
 #ifdef CONFIG_COMPAT
        long (*compat_ioctl32) (struct file *, unsigned int, unsigned long);

diff --git a/include/sound/hwdep.h b/include/sound/hwdep.h
index ab9fcb2f97f0abfbb1307138eec19e7f0dbe6a39..afeca593188a7a93317933c3b7b101880992b7cb 100644 (file)
--- a/include/sound/hwdep.h
+++ b/include/sound/hwdep.h
@@ -37,7 +37,7 @@ struct snd_hwdep_ops {
                      long count, loff_t *offset);
        int (*open)(struct snd_hwdep *hw, struct file * file);
        int (*release)(struct snd_hwdep *hw, struct file * file);
-       unsigned int (*poll)(struct snd_hwdep *hw, struct file *file,
+       __poll_t (*poll)(struct snd_hwdep *hw, struct file *file,
                             poll_table *wait);
        int (*ioctl)(struct snd_hwdep *hw, struct file *file,
                     unsigned int cmd, unsigned long arg);

diff --git a/include/sound/info.h b/include/sound/info.h
index 67390ee846aa2a666cbe649f7217fa3be17cc519..becdf66d2825e9c5a65ff5cbcf63868bf29eac9d 100644 (file)
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -62,7 +62,7 @@ struct snd_info_entry_ops {
        loff_t (*llseek)(struct snd_info_entry *entry,
                         void *file_private_data, struct file *file,
                         loff_t offset, int orig);
-       unsigned int (*poll)(struct snd_info_entry *entry,
+       __poll_t (*poll)(struct snd_info_entry *entry,
                             void *file_private_data, struct file *file,
                             poll_table *wait);
        int (*ioctl)(struct snd_info_entry *entry, void *file_private_data,