Commit a3f8683b authored by Al Viro's avatar Al Viro
Browse files

->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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 8ced390c

fs/proc/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *);

include/linux/net.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/posix-clock.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/linux/tty_ldisc.h

+1 −1
Original line number Diff line number Diff line
@@ -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);