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

the rest of drivers/*: annotate ->poll() instances



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c23e0cb8
......@@ -4276,7 +4276,7 @@ static int binder_thread_release(struct binder_proc *proc,
return active_transactions;
}
static unsigned int binder_poll(struct file *filp,
static __poll_t binder_poll(struct file *filp,
struct poll_table_struct *wait)
{
struct binder_proc *proc = filp->private_data;
......
......@@ -794,7 +794,7 @@ static ssize_t hci_uart_tty_write(struct tty_struct *tty, struct file *file,
return 0;
}
static unsigned int hci_uart_tty_poll(struct tty_struct *tty,
static __poll_t hci_uart_tty_poll(struct tty_struct *tty,
struct file *filp, poll_table *wait)
{
return 0;
......
......@@ -299,7 +299,7 @@ static ssize_t vhci_write(struct kiocb *iocb, struct iov_iter *from)
return vhci_get_user(data, from);
}
static unsigned int vhci_poll(struct file *file, poll_table *wait)
static __poll_t vhci_poll(struct file *file, poll_table *wait)
{
struct vhci_data *data = file->private_data;
......
......@@ -236,7 +236,7 @@ static ssize_t apm_read(struct file *fp, char __user *buf, size_t count, loff_t
return ret;
}
static unsigned int apm_poll(struct file *fp, poll_table * wait)
static __poll_t apm_poll(struct file *fp, poll_table * wait)
{
struct apm_user *as = fp->private_data;
......
......@@ -406,7 +406,7 @@ static long dsp56k_ioctl(struct file *file, unsigned int cmd,
* Do I need this function at all???
*/
#if 0
static unsigned int dsp56k_poll(struct file *file, poll_table *wait)
static __poll_t dsp56k_poll(struct file *file, poll_table *wait)
{
int dev = iminor(file_inode(file)) & 0x0f;
......
......@@ -91,7 +91,7 @@ static ssize_t dtlk_read(struct file *, char __user *,
size_t nbytes, loff_t * ppos);
static ssize_t dtlk_write(struct file *, const char __user *,
size_t nbytes, loff_t * ppos);
static unsigned int dtlk_poll(struct file *, poll_table *);
static __poll_t dtlk_poll(struct file *, poll_table *);
static int dtlk_open(struct inode *, struct file *);
static int dtlk_release(struct inode *, struct file *);
static long dtlk_ioctl(struct file *file,
......@@ -228,9 +228,9 @@ static ssize_t dtlk_write(struct file *file, const char __user *buf,
return -EAGAIN;
}
static unsigned int dtlk_poll(struct file *file, poll_table * wait)
static __poll_t dtlk_poll(struct file *file, poll_table * wait)
{
int mask = 0;
__poll_t mask = 0;
unsigned long expires;
TRACE_TEXT(" dtlk_poll");
......
......@@ -342,7 +342,7 @@ out:
return retval;
}
static unsigned int hpet_poll(struct file *file, poll_table * wait)
static __poll_t hpet_poll(struct file *file, poll_table * wait)
{
unsigned long v;
struct hpet_dev *devp;
......
......@@ -338,10 +338,10 @@ static int bt_bmc_release(struct inode *inode, struct file *file)
return 0;
}
static unsigned int bt_bmc_poll(struct file *file, poll_table *wait)
static __poll_t bt_bmc_poll(struct file *file, poll_table *wait)
{
struct bt_bmc *bt_bmc = file_bt_bmc(file);
unsigned int mask = 0;
__poll_t mask = 0;
u8 ctrl;
poll_wait(file, &bt_bmc->queue, wait);
......
......@@ -78,10 +78,10 @@ static void file_receive_handler(struct ipmi_recv_msg *msg,
spin_unlock_irqrestore(&(priv->recv_msg_lock), flags);
}
static unsigned int ipmi_poll(struct file *file, poll_table *wait)
static __poll_t ipmi_poll(struct file *file, poll_table *wait)
{
struct ipmi_file_private *priv = file->private_data;
unsigned int mask = 0;
__poll_t mask = 0;
unsigned long flags;
poll_wait(file, &priv->wait, wait);
......
......@@ -887,9 +887,9 @@ static int ipmi_open(struct inode *ino, struct file *filep)
}
}
static unsigned int ipmi_poll(struct file *file, poll_table *wait)
static __poll_t ipmi_poll(struct file *file, poll_table *wait)
{
unsigned int mask = 0;
__poll_t mask = 0;
poll_wait(file, &read_q, wait);
......
......@@ -415,10 +415,10 @@ static ssize_t cm4040_write(struct file *filp, const char __user *buf,
return count;
}
static unsigned int cm4040_poll(struct file *filp, poll_table *wait)
static __poll_t cm4040_poll(struct file *filp, poll_table *wait)
{
struct reader_dev *dev = filp->private_data;
unsigned int mask = 0;
__poll_t mask = 0;
poll_wait(filp, &dev->poll_wait, wait);
......
......@@ -769,10 +769,10 @@ static int pp_release(struct inode *inode, struct file *file)
}
/* No kernel lock held - fine */
static unsigned int pp_poll(struct file *file, poll_table *wait)
static __poll_t pp_poll(struct file *file, poll_table *wait)
{
struct pp_struct *pp = file->private_data;
unsigned int mask = 0;
__poll_t mask = 0;
poll_wait(file, &pp->irq_wait, wait);
if (atomic_read(&pp->irqc))
......
......@@ -1784,10 +1784,10 @@ urandom_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
return ret;
}
static unsigned int
static __poll_t
random_poll(struct file *file, poll_table * wait)
{
unsigned int mask;
__poll_t mask;
poll_wait(file, &random_read_wait, wait);
poll_wait(file, &random_write_wait, wait);
......
......@@ -147,7 +147,7 @@ static long rtc_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
static void rtc_get_rtc_time(struct rtc_time *rtc_tm);
#ifdef RTC_IRQ
static unsigned int rtc_poll(struct file *file, poll_table *wait);
static __poll_t rtc_poll(struct file *file, poll_table *wait);
#endif
static void get_rtc_alm_time(struct rtc_time *alm_tm);
......@@ -790,7 +790,7 @@ no_irq:
}
#ifdef RTC_IRQ
static unsigned int rtc_poll(struct file *file, poll_table *wait)
static __poll_t rtc_poll(struct file *file, poll_table *wait)
{
unsigned long l;
......
......@@ -321,10 +321,10 @@ scdrv_write(struct file *file, const char __user *buf,
return status;
}
static unsigned int
static __poll_t
scdrv_poll(struct file *file, struct poll_table_struct *wait)
{
unsigned int mask = 0;
__poll_t mask = 0;
int status = 0;
struct subch_data_s *sd = (struct subch_data_s *) file->private_data;
unsigned long flags;
......
......@@ -940,7 +940,7 @@ static ssize_t sonypi_misc_read(struct file *file, char __user *buf,
return ret;
}
static unsigned int sonypi_misc_poll(struct file *file, poll_table *wait)
static __poll_t sonypi_misc_poll(struct file *file, poll_table *wait)
{
poll_wait(file, &sonypi_device.fifo_proc_list, wait);
if (kfifo_len(&sonypi_device.fifo))
......
......@@ -173,10 +173,10 @@ static ssize_t vtpm_proxy_fops_write(struct file *filp, const char __user *buf,
*
* Return: Poll flags
*/
static unsigned int vtpm_proxy_fops_poll(struct file *filp, poll_table *wait)
static __poll_t vtpm_proxy_fops_poll(struct file *filp, poll_table *wait)
{
struct proxy_dev *proxy_dev = filp->private_data;
unsigned ret;
__poll_t ret;
poll_wait(filp, &proxy_dev->wq, wait);
......
......@@ -982,10 +982,10 @@ error_out:
return ret;
}
static unsigned int port_fops_poll(struct file *filp, poll_table *wait)
static __poll_t port_fops_poll(struct file *filp, poll_table *wait)
{
struct port *port;
unsigned int ret;
__poll_t ret;
port = filp->private_data;
poll_wait(filp, &port->waitqueue, wait);
......
......@@ -1736,10 +1736,10 @@ end:
return pos;
}
static unsigned int xillybus_poll(struct file *filp, poll_table *wait)
static __poll_t xillybus_poll(struct file *filp, poll_table *wait)
{
struct xilly_channel *channel = filp->private_data;
unsigned int mask = 0;
__poll_t mask = 0;
unsigned long flags;
poll_wait(filp, &channel->endpoint->ep_wait, wait);
......
......@@ -157,7 +157,7 @@ static void dma_buf_poll_cb(struct dma_fence *fence, struct dma_fence_cb *cb)
spin_unlock_irqrestore(&dcb->poll->lock, flags);
}
static unsigned int dma_buf_poll(struct file *file, poll_table *poll)
static __poll_t dma_buf_poll(struct file *file, poll_table *poll)
{
struct dma_buf *dmabuf;
struct reservation_object *resv;
......@@ -195,7 +195,7 @@ retry:
if (fence_excl && (!(events & POLLOUT) || shared_count == 0)) {
struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_excl;
unsigned long pevents = POLLIN;
__poll_t pevents = POLLIN;
if (shared_count == 0)
pevents |= POLLOUT;
......
Supports Markdown
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