Commit 680ef72a authored by Al Viro's avatar Al Viro

sound: annotate ->poll() instances

Signed-off-by: 's avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0d9b87f3
...@@ -396,7 +396,7 @@ static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma) ...@@ -396,7 +396,7 @@ static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma)
return -ENXIO; return -ENXIO;
} }
static inline int snd_compr_get_poll(struct snd_compr_stream *stream) static __poll_t snd_compr_get_poll(struct snd_compr_stream *stream)
{ {
if (stream->direction == SND_COMPRESS_PLAYBACK) if (stream->direction == SND_COMPRESS_PLAYBACK)
return POLLOUT | POLLWRNORM; return POLLOUT | POLLWRNORM;
...@@ -404,12 +404,12 @@ static inline int snd_compr_get_poll(struct snd_compr_stream *stream) ...@@ -404,12 +404,12 @@ static inline int snd_compr_get_poll(struct snd_compr_stream *stream)
return POLLIN | POLLRDNORM; return POLLIN | POLLRDNORM;
} }
static unsigned int snd_compr_poll(struct file *f, poll_table *wait) static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
{ {
struct snd_compr_file *data = f->private_data; struct snd_compr_file *data = f->private_data;
struct snd_compr_stream *stream; struct snd_compr_stream *stream;
size_t avail; size_t avail;
int retval = 0; __poll_t retval = 0;
if (snd_BUG_ON(!data)) if (snd_BUG_ON(!data))
return POLLERR; return POLLERR;
......
...@@ -1666,9 +1666,9 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer, ...@@ -1666,9 +1666,9 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer,
return result > 0 ? result : err; return result > 0 ? result : err;
} }
static unsigned int snd_ctl_poll(struct file *file, poll_table * wait) static __poll_t snd_ctl_poll(struct file *file, poll_table * wait)
{ {
unsigned int mask; __poll_t mask;
struct snd_ctl_file *ctl; struct snd_ctl_file *ctl;
ctl = file->private_data; ctl = file->private_data;
......
...@@ -177,7 +177,7 @@ static int snd_hwdep_release(struct inode *inode, struct file * file) ...@@ -177,7 +177,7 @@ static int snd_hwdep_release(struct inode *inode, struct file * file)
return err; return err;
} }
static unsigned int snd_hwdep_poll(struct file * file, poll_table * wait) static __poll_t snd_hwdep_poll(struct file * file, poll_table * wait)
{ {
struct snd_hwdep *hw = file->private_data; struct snd_hwdep *hw = file->private_data;
if (hw->ops.poll) if (hw->ops.poll)
......
...@@ -203,11 +203,11 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer ...@@ -203,11 +203,11 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer
return size; return size;
} }
static unsigned int snd_info_entry_poll(struct file *file, poll_table *wait) static __poll_t snd_info_entry_poll(struct file *file, poll_table *wait)
{ {
struct snd_info_private_data *data = file->private_data; struct snd_info_private_data *data = file->private_data;
struct snd_info_entry *entry = data->entry; struct snd_info_entry *entry = data->entry;
unsigned int mask = 0; __poll_t mask = 0;
if (entry->c.ops->poll) if (entry->c.ops->poll)
return entry->c.ops->poll(entry, return entry->c.ops->poll(entry,
......
...@@ -344,7 +344,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file) ...@@ -344,7 +344,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file)
panic("%s(%p, %p) failed!", __func__, inode, file); panic("%s(%p, %p) failed!", __func__, inode, file);
} }
static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait) static __poll_t snd_disconnect_poll(struct file * file, poll_table * wait)
{ {
return POLLERR | POLLNVAL; return POLLERR | POLLNVAL;
} }
......
...@@ -2673,10 +2673,10 @@ static int snd_pcm_oss_capture_ready(struct snd_pcm_substream *substream) ...@@ -2673,10 +2673,10 @@ static int snd_pcm_oss_capture_ready(struct snd_pcm_substream *substream)
runtime->oss.period_frames; runtime->oss.period_frames;
} }
static unsigned int snd_pcm_oss_poll(struct file *file, poll_table * wait) static __poll_t snd_pcm_oss_poll(struct file *file, poll_table * wait)
{ {
struct snd_pcm_oss_file *pcm_oss_file; struct snd_pcm_oss_file *pcm_oss_file;
unsigned int mask; __poll_t mask;
struct snd_pcm_substream *psubstream = NULL, *csubstream = NULL; struct snd_pcm_substream *psubstream = NULL, *csubstream = NULL;
pcm_oss_file = file->private_data; pcm_oss_file = file->private_data;
......
...@@ -3130,12 +3130,12 @@ static ssize_t snd_pcm_writev(struct kiocb *iocb, struct iov_iter *from) ...@@ -3130,12 +3130,12 @@ static ssize_t snd_pcm_writev(struct kiocb *iocb, struct iov_iter *from)
return result; return result;
} }
static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait) static __poll_t snd_pcm_playback_poll(struct file *file, poll_table * wait)
{ {
struct snd_pcm_file *pcm_file; struct snd_pcm_file *pcm_file;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct snd_pcm_runtime *runtime; struct snd_pcm_runtime *runtime;
unsigned int mask; __poll_t mask;
snd_pcm_uframes_t avail; snd_pcm_uframes_t avail;
pcm_file = file->private_data; pcm_file = file->private_data;
...@@ -3169,12 +3169,12 @@ static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait) ...@@ -3169,12 +3169,12 @@ static unsigned int snd_pcm_playback_poll(struct file *file, poll_table * wait)
return mask; return mask;
} }
static unsigned int snd_pcm_capture_poll(struct file *file, poll_table * wait) static __poll_t snd_pcm_capture_poll(struct file *file, poll_table * wait)
{ {
struct snd_pcm_file *pcm_file; struct snd_pcm_file *pcm_file;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct snd_pcm_runtime *runtime; struct snd_pcm_runtime *runtime;
unsigned int mask; __poll_t mask;
snd_pcm_uframes_t avail; snd_pcm_uframes_t avail;
pcm_file = file->private_data; pcm_file = file->private_data;
......
...@@ -1357,11 +1357,11 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf, ...@@ -1357,11 +1357,11 @@ static ssize_t snd_rawmidi_write(struct file *file, const char __user *buf,
return result; return result;
} }
static unsigned int snd_rawmidi_poll(struct file *file, poll_table * wait) static __poll_t snd_rawmidi_poll(struct file *file, poll_table * wait)
{ {
struct snd_rawmidi_file *rfile; struct snd_rawmidi_file *rfile;
struct snd_rawmidi_runtime *runtime; struct snd_rawmidi_runtime *runtime;
unsigned int mask; __poll_t mask;
rfile = file->private_data; rfile = file->private_data;
if (rfile->input != NULL) { if (rfile->input != NULL) {
......
...@@ -59,7 +59,7 @@ static int odev_release(struct inode *inode, struct file *file); ...@@ -59,7 +59,7 @@ static int odev_release(struct inode *inode, struct file *file);
static ssize_t odev_read(struct file *file, char __user *buf, size_t count, loff_t *offset); static ssize_t odev_read(struct file *file, char __user *buf, size_t count, loff_t *offset);
static ssize_t odev_write(struct file *file, const char __user *buf, size_t count, loff_t *offset); static ssize_t odev_write(struct file *file, const char __user *buf, size_t count, loff_t *offset);
static long odev_ioctl(struct file *file, unsigned int cmd, unsigned long arg); static long odev_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
static unsigned int odev_poll(struct file *file, poll_table * wait); static __poll_t odev_poll(struct file *file, poll_table * wait);
/* /*
...@@ -197,7 +197,7 @@ static long odev_ioctl_compat(struct file *file, unsigned int cmd, ...@@ -197,7 +197,7 @@ static long odev_ioctl_compat(struct file *file, unsigned int cmd,
#define odev_ioctl_compat NULL #define odev_ioctl_compat NULL
#endif #endif
static unsigned int static __poll_t
odev_poll(struct file *file, poll_table * wait) odev_poll(struct file *file, poll_table * wait)
{ {
struct seq_oss_devinfo *dp; struct seq_oss_devinfo *dp;
......
...@@ -124,7 +124,7 @@ void snd_seq_oss_release(struct seq_oss_devinfo *dp); ...@@ -124,7 +124,7 @@ void snd_seq_oss_release(struct seq_oss_devinfo *dp);
int snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long arg); int snd_seq_oss_ioctl(struct seq_oss_devinfo *dp, unsigned int cmd, unsigned long arg);
int snd_seq_oss_read(struct seq_oss_devinfo *dev, char __user *buf, int count); int snd_seq_oss_read(struct seq_oss_devinfo *dev, char __user *buf, int count);
int snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int count, struct file *opt); int snd_seq_oss_write(struct seq_oss_devinfo *dp, const char __user *buf, int count, struct file *opt);
unsigned int snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait); __poll_t snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait);
void snd_seq_oss_reset(struct seq_oss_devinfo *dp); void snd_seq_oss_reset(struct seq_oss_devinfo *dp);
......
...@@ -196,10 +196,10 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt) ...@@ -196,10 +196,10 @@ insert_queue(struct seq_oss_devinfo *dp, union evrec *rec, struct file *opt)
* select / poll * select / poll
*/ */
unsigned int __poll_t
snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait) snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wait)
{ {
unsigned int mask = 0; __poll_t mask = 0;
/* input */ /* input */
if (dp->readq && is_read_mode(dp->file_mode)) { if (dp->readq && is_read_mode(dp->file_mode)) {
......
...@@ -1086,10 +1086,10 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf, ...@@ -1086,10 +1086,10 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf,
/* /*
* handle polling * handle polling
*/ */
static unsigned int snd_seq_poll(struct file *file, poll_table * wait) static __poll_t snd_seq_poll(struct file *file, poll_table * wait)
{ {
struct snd_seq_client *client = file->private_data; struct snd_seq_client *client = file->private_data;
unsigned int mask = 0; __poll_t mask = 0;
/* check client structures are in place */ /* check client structures are in place */
if (snd_BUG_ON(!client)) if (snd_BUG_ON(!client))
......
...@@ -2072,9 +2072,9 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer, ...@@ -2072,9 +2072,9 @@ static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
return result > 0 ? result : err; return result > 0 ? result : err;
} }
static unsigned int snd_timer_user_poll(struct file *file, poll_table * wait) static __poll_t snd_timer_user_poll(struct file *file, poll_table * wait)
{ {
unsigned int mask; __poll_t mask;
struct snd_timer_user *tu; struct snd_timer_user *tu;
tu = file->private_data; tu = file->private_data;
......
...@@ -53,11 +53,11 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, ...@@ -53,11 +53,11 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,
return count; return count;
} }
static unsigned int static __poll_t
hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait) hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait)
{ {
struct snd_bebob *bebob = hwdep->private_data; struct snd_bebob *bebob = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &bebob->hwdep_wait, wait); poll_wait(file, &bebob->hwdep_wait, wait);
......
...@@ -52,11 +52,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, ...@@ -52,11 +52,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf,
return count; return count;
} }
static unsigned int hwdep_poll(struct snd_hwdep *hwdep, struct file *file, static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct snd_dice *dice = hwdep->private_data; struct snd_dice *dice = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &dice->hwdep_wait, wait); poll_wait(file, &dice->hwdep_wait, wait);
......
...@@ -60,11 +60,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, ...@@ -60,11 +60,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,
return count; return count;
} }
static unsigned int hwdep_poll(struct snd_hwdep *hwdep, struct file *file, static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct snd_dg00x *dg00x = hwdep->private_data; struct snd_dg00x *dg00x = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &dg00x->hwdep_wait, wait); poll_wait(file, &dg00x->hwdep_wait, wait);
......
...@@ -52,11 +52,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, ...@@ -52,11 +52,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,
return count; return count;
} }
static unsigned int hwdep_poll(struct snd_hwdep *hwdep, struct file *file, static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct snd_ff *ff = hwdep->private_data; struct snd_ff *ff = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &ff->hwdep_wait, wait); poll_wait(file, &ff->hwdep_wait, wait);
......
...@@ -184,11 +184,11 @@ hwdep_write(struct snd_hwdep *hwdep, const char __user *data, long count, ...@@ -184,11 +184,11 @@ hwdep_write(struct snd_hwdep *hwdep, const char __user *data, long count,
return count; return count;
} }
static unsigned int static __poll_t
hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait) hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait)
{ {
struct snd_efw *efw = hwdep->private_data; struct snd_efw *efw = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &efw->hwdep_wait, wait); poll_wait(file, &efw->hwdep_wait, wait);
......
...@@ -59,11 +59,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, ...@@ -59,11 +59,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,
return count; return count;
} }
static unsigned int hwdep_poll(struct snd_hwdep *hwdep, struct file *file, static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct snd_motu *motu = hwdep->private_data; struct snd_motu *motu = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &motu->hwdep_wait, wait); poll_wait(file, &motu->hwdep_wait, wait);
......
...@@ -52,11 +52,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, ...@@ -52,11 +52,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,
return count; return count;
} }
static unsigned int hwdep_poll(struct snd_hwdep *hwdep, struct file *file, static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct snd_oxfw *oxfw = hwdep->private_data; struct snd_oxfw *oxfw = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &oxfw->hwdep_wait, wait); poll_wait(file, &oxfw->hwdep_wait, wait);
......
...@@ -50,11 +50,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, ...@@ -50,11 +50,11 @@ static long hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count,
return count; return count;
} }
static unsigned int hwdep_poll(struct snd_hwdep *hwdep, struct file *file, static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct snd_tscm *tscm = hwdep->private_data; struct snd_tscm *tscm = hwdep->private_data;
unsigned int events; __poll_t events;
poll_wait(file, &tscm->hwdep_wait, wait); poll_wait(file, &tscm->hwdep_wait, wait);
......
...@@ -670,9 +670,9 @@ static ssize_t sq_write(struct file *file, const char __user *src, size_t uLeft, ...@@ -670,9 +670,9 @@ static ssize_t sq_write(struct file *file, const char __user *src, size_t uLeft,
return uUsed < 0? uUsed: uWritten; return uUsed < 0? uUsed: uWritten;
} }
static unsigned int sq_poll(struct file *file, struct poll_table_struct *wait) static __poll_t sq_poll(struct file *file, struct poll_table_struct *wait)
{ {
unsigned int mask = 0; __poll_t mask = 0;
int retVal; int retVal;
if (write_sq.locked == 0) { if (write_sq.locked == 0) {
......
...@@ -239,7 +239,7 @@ static long snd_usb_sbrc_hwdep_read(struct snd_hwdep *hw, char __user *buf, ...@@ -239,7 +239,7 @@ static long snd_usb_sbrc_hwdep_read(struct snd_hwdep *hw, char __user *buf,
return err < 0 ? err : count; return err < 0 ? err : count;
} }
static unsigned int snd_usb_sbrc_hwdep_poll(struct snd_hwdep *hw, struct file *file, static __poll_t snd_usb_sbrc_hwdep_poll(struct snd_hwdep *hw, struct file *file,
poll_table *wait) poll_table *wait)
{ {
struct usb_mixer_interface *mixer = hw->private_data; struct usb_mixer_interface *mixer = hw->private_data;
......
...@@ -271,12 +271,12 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw, ...@@ -271,12 +271,12 @@ static int usb_stream_hwdep_mmap(struct snd_hwdep *hw,
return err; return err;
} }
static unsigned int usb_stream_hwdep_poll(struct snd_hwdep *hw, static __poll_t usb_stream_hwdep_poll(struct snd_hwdep *hw,
struct file *file, poll_table *wait) struct file *file, poll_table *wait)
{ {
struct us122l *us122l = hw->private_data; struct us122l *us122l = hw->private_data;
unsigned *polled; unsigned *polled;
unsigned int mask; __poll_t mask;
poll_wait(file, &us122l->sk.sleep, wait); poll_wait(file, &us122l->sk.sleep, wait);
......
...@@ -86,9 +86,9 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v ...@@ -86,9 +86,9 @@ static int snd_us428ctls_mmap(struct snd_hwdep * hw, struct file *filp, struct v
return 0; return 0;
} }
static unsigned int snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file, poll_table *wait) static __poll_t snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file, poll_table *wait)
{ {
unsigned int mask = 0; __poll_t mask = 0;
struct usX2Ydev *us428 = hw->private_data; struct usX2Ydev *us428 = hw->private_data;
struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem; struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem;
if (us428->chip_status & USX2Y_STAT_CHIP_HUP) if (us428->chip_status & USX2Y_STAT_CHIP_HUP)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment