forked from Minki/linux
->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>
This commit is contained in:
parent
8ced390c2b
commit
a3f8683bf7
@ -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)
|
||||
|
@ -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 *);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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 *);
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user