Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

sound: annotate ->poll() instances 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0d9b87f3

sound/core/compress_offload.c

+3 −3
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma) 
	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)

		return POLLOUT | POLLWRNORM;
@@ -404,12 +404,12 @@ static inline int snd_compr_get_poll(struct snd_compr_stream *stream) 
		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_stream *stream;

	size_t avail;

	int retval = 0;

	__poll_t retval = 0;



	if (snd_BUG_ON(!data))

		return POLLERR;

sound/core/control.c

+2 −2
Original line number Diff line number Diff line
@@ -1666,9 +1666,9 @@ static ssize_t snd_ctl_read(struct file *file, char __user *buffer, 
      	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;



	ctl = file->private_data;

sound/core/hwdep.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int snd_hwdep_release(struct inode *inode, struct file * file) 
	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;

	if (hw->ops.poll)

sound/core/info.c

+2 −2
Original line number Diff line number Diff line
@@ -203,11 +203,11 @@ static ssize_t snd_info_entry_write(struct file *file, const char __user *buffer 
	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_entry *entry = data->entry;

	unsigned int mask = 0;

	__poll_t mask = 0;



	if (entry->c.ops->poll)

		return entry->c.ops->poll(entry,

sound/core/init.c

+1 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *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;

}