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

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

net: annotate ->poll() instances 



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

drivers/staging/irda/net/af_irda.c

+2 −2
Original line number Diff line number Diff line
@@ -1737,12 +1737,12 @@ static int irda_shutdown(struct socket *sock, int how) 
/*

 * Function irda_poll (file, sock, wait)

 */

static unsigned int irda_poll(struct file * file, struct socket *sock,

static __poll_t irda_poll(struct file * file, struct socket *sock,

			      poll_table *wait)

{

	struct sock *sk = sock->sk;

	struct irda_sock *self = irda_sk(sk);

	unsigned int mask;

	__poll_t mask;



	poll_wait(file, sk_sleep(sk), wait);

	mask = 0;

drivers/staging/irda/net/irnet/irnet_ppp.c

+4 −4
Original line number Diff line number Diff line
@@ -419,12 +419,12 @@ irnet_ctrl_read(irnet_socket * ap, 
 * Poll : called when someone do a select on /dev/irnet.

 * Just check if there are new events...

 */

static inline unsigned int

static inline __poll_t

irnet_ctrl_poll(irnet_socket *	ap,

		struct file *	file,

		poll_table *	wait)

{

  unsigned int mask;

  __poll_t mask;



  DENTER(CTRL_TRACE, "(ap=0x%p)\n", ap);
@@ -608,12 +608,12 @@ dev_irnet_read(struct file * file, 
/*

 * Poll : called when someone do a select on /dev/irnet

 */

static unsigned int

static __poll_t

dev_irnet_poll(struct file *	file,

	       poll_table *	wait)

{

  irnet_socket *	ap = file->private_data;

  unsigned int		mask;

  __poll_t		mask;



  DENTER(FS_TRACE, "(file=0x%p, ap=0x%p)\n",

	 file, ap);

drivers/staging/irda/net/irnet/irnet_ppp.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static ssize_t 
		       char __user *,

		       size_t,

		       loff_t *);

static unsigned int

static __poll_t

	dev_irnet_poll(struct file *,

		       poll_table *);

static long

include/linux/skbuff.h

+1 −1
Original line number Diff line number Diff line
@@ -3242,7 +3242,7 @@ struct sk_buff *__skb_recv_datagram(struct sock *sk, unsigned flags, 
				    int *peeked, int *off, int *err);

struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,

				  int *err);

unsigned int datagram_poll(struct file *file, struct socket *sock,

__poll_t datagram_poll(struct file *file, struct socket *sock,

			   struct poll_table_struct *wait);

int skb_copy_datagram_iter(const struct sk_buff *from, int offset,

			   struct iov_iter *to, int size);

include/net/bluetooth/bluetooth.h

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ int bt_sock_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, 
		     int flags);

int  bt_sock_stream_recvmsg(struct socket *sock, struct msghdr *msg,

			    size_t len, int flags);

uint bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);

__poll_t bt_sock_poll(struct file *file, struct socket *sock, poll_table *wait);

int  bt_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg);

int  bt_sock_wait_state(struct sock *sk, int state, unsigned long timeo);

int  bt_sock_wait_ready(struct sock *sk, unsigned long flags);