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

Commit 87c1c093 authored by Al Viro's avatar Al Viro
Browse files

cris: annotate ->poll() instances 



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

arch/cris/arch-v10/drivers/gpio.c

+3 −3
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static ssize_t gpio_write(struct file *file, const char __user *buf, 
	size_t count, loff_t *off);

static int gpio_open(struct inode *inode, struct file *filp);

static int gpio_release(struct inode *inode, struct file *filp);

static unsigned int gpio_poll(struct file *filp, struct poll_table_struct *wait);

static __poll_t gpio_poll(struct file *filp, struct poll_table_struct *wait);



/* private data per open() of this driver */
@@ -141,9 +141,9 @@ static unsigned long dir_g_shadow; /* 1=output */ 
#define USE_PORTS(priv) ((priv)->minor <= GPIO_MINOR_B)





static unsigned int gpio_poll(struct file *file, poll_table *wait)

static __poll_t gpio_poll(struct file *file, poll_table *wait)

{

	unsigned int mask = 0;

	__poll_t mask = 0;

	struct gpio_private *priv = file->private_data;

	unsigned long data;

	unsigned long flags;

arch/cris/arch-v10/drivers/sync_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static inline int sync_data_avail(struct sync_port *port); 


static int sync_serial_open(struct inode *inode, struct file *file);

static int sync_serial_release(struct inode *inode, struct file *file);

static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);

static __poll_t sync_serial_poll(struct file *filp, poll_table *wait);



static long sync_serial_ioctl(struct file *file,

	unsigned int cmd, unsigned long arg);
@@ -654,12 +654,12 @@ static int sync_serial_release(struct inode *inode, struct file *file) 






static unsigned int sync_serial_poll(struct file *file, poll_table *wait)

static __poll_t sync_serial_poll(struct file *file, poll_table *wait)

{

	int dev = MINOR(file_inode(file)->i_rdev);

	unsigned int mask = 0;

	__poll_t mask = 0;

	struct sync_port *port;

	DEBUGPOLL(static unsigned int prev_mask = 0);

	DEBUGPOLL(static __poll_t prev_mask = 0);



	port = &ports[dev];

	poll_wait(file, &port->out_wait_q, wait);

arch/cris/arch-v32/drivers/sync_serial.c

+4 −4
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static inline int sync_data_avail(struct sync_port *port); 


static int sync_serial_open(struct inode *, struct file *);

static int sync_serial_release(struct inode *, struct file *);

static unsigned int sync_serial_poll(struct file *filp, poll_table *wait);

static __poll_t sync_serial_poll(struct file *filp, poll_table *wait);



static long sync_serial_ioctl(struct file *file,

			      unsigned int cmd, unsigned long arg);
@@ -555,13 +555,13 @@ static int sync_serial_release(struct inode *inode, struct file *file) 
	return 0;

}



static unsigned int sync_serial_poll(struct file *file, poll_table *wait)

static __poll_t sync_serial_poll(struct file *file, poll_table *wait)

{

	int dev = iminor(file_inode(file));

	unsigned int mask = 0;

	__poll_t mask = 0;

	struct sync_port *port;

	DEBUGPOLL(

	static unsigned int prev_mask;

	static __poll_t prev_mask;

	);



	port = &ports[dev];