diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2017-07-02 22:25:05 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-11-27 16:19:57 -0500 |
commit | 87c1c0935890492fdb240922dd86088c589bae18 (patch) | |
tree | e201705f0e98e9e0bf4ce36dc316136487652d92 | |
parent | 01e5d5562988efdebd6502a7e528d9bd5b8ca200 (diff) |
cris: annotate ->poll() instances
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/cris/arch-v10/drivers/gpio.c | 6 | ||||
-rw-r--r-- | arch/cris/arch-v10/drivers/sync_serial.c | 8 | ||||
-rw-r--r-- | arch/cris/arch-v32/drivers/sync_serial.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c index 68dbe261dc57..a2986c60aaac 100644 --- a/arch/cris/arch-v10/drivers/gpio.c +++ b/arch/cris/arch-v10/drivers/gpio.c | |||
@@ -50,7 +50,7 @@ static ssize_t gpio_write(struct file *file, const char __user *buf, | |||
50 | size_t count, loff_t *off); | 50 | size_t count, loff_t *off); |
51 | static int gpio_open(struct inode *inode, struct file *filp); | 51 | static int gpio_open(struct inode *inode, struct file *filp); |
52 | static int gpio_release(struct inode *inode, struct file *filp); | 52 | static int gpio_release(struct inode *inode, struct file *filp); |
53 | static unsigned int gpio_poll(struct file *filp, struct poll_table_struct *wait); | 53 | static __poll_t gpio_poll(struct file *filp, struct poll_table_struct *wait); |
54 | 54 | ||
55 | /* private data per open() of this driver */ | 55 | /* private data per open() of this driver */ |
56 | 56 | ||
@@ -141,9 +141,9 @@ static unsigned long dir_g_shadow; /* 1=output */ | |||
141 | #define USE_PORTS(priv) ((priv)->minor <= GPIO_MINOR_B) | 141 | #define USE_PORTS(priv) ((priv)->minor <= GPIO_MINOR_B) |
142 | 142 | ||
143 | 143 | ||
144 | static unsigned int gpio_poll(struct file *file, poll_table *wait) | 144 | static __poll_t gpio_poll(struct file *file, poll_table *wait) |
145 | { | 145 | { |
146 | unsigned int mask = 0; | 146 | __poll_t mask = 0; |
147 | struct gpio_private *priv = file->private_data; | 147 | struct gpio_private *priv = file->private_data; |
148 | unsigned long data; | 148 | unsigned long data; |
149 | unsigned long flags; | 149 | unsigned long flags; |
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c index cfe9176f2205..177843c64071 100644 --- a/arch/cris/arch-v10/drivers/sync_serial.c +++ b/arch/cris/arch-v10/drivers/sync_serial.c | |||
@@ -157,7 +157,7 @@ static inline int sync_data_avail(struct sync_port *port); | |||
157 | 157 | ||
158 | static int sync_serial_open(struct inode *inode, struct file *file); | 158 | static int sync_serial_open(struct inode *inode, struct file *file); |
159 | static int sync_serial_release(struct inode *inode, struct file *file); | 159 | static int sync_serial_release(struct inode *inode, struct file *file); |
160 | static unsigned int sync_serial_poll(struct file *filp, poll_table *wait); | 160 | static __poll_t sync_serial_poll(struct file *filp, poll_table *wait); |
161 | 161 | ||
162 | static long sync_serial_ioctl(struct file *file, | 162 | static long sync_serial_ioctl(struct file *file, |
163 | unsigned int cmd, unsigned long arg); | 163 | unsigned int cmd, unsigned long arg); |
@@ -654,12 +654,12 @@ static int sync_serial_release(struct inode *inode, struct file *file) | |||
654 | 654 | ||
655 | 655 | ||
656 | 656 | ||
657 | static unsigned int sync_serial_poll(struct file *file, poll_table *wait) | 657 | static __poll_t sync_serial_poll(struct file *file, poll_table *wait) |
658 | { | 658 | { |
659 | int dev = MINOR(file_inode(file)->i_rdev); | 659 | int dev = MINOR(file_inode(file)->i_rdev); |
660 | unsigned int mask = 0; | 660 | __poll_t mask = 0; |
661 | struct sync_port *port; | 661 | struct sync_port *port; |
662 | DEBUGPOLL(static unsigned int prev_mask = 0); | 662 | DEBUGPOLL(static __poll_t prev_mask = 0); |
663 | 663 | ||
664 | port = &ports[dev]; | 664 | port = &ports[dev]; |
665 | poll_wait(file, &port->out_wait_q, wait); | 665 | poll_wait(file, &port->out_wait_q, wait); |
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c index 8efcc1a899a8..e20e0b9a3a5c 100644 --- a/arch/cris/arch-v32/drivers/sync_serial.c +++ b/arch/cris/arch-v32/drivers/sync_serial.c | |||
@@ -178,7 +178,7 @@ static inline int sync_data_avail(struct sync_port *port); | |||
178 | 178 | ||
179 | static int sync_serial_open(struct inode *, struct file *); | 179 | static int sync_serial_open(struct inode *, struct file *); |
180 | static int sync_serial_release(struct inode *, struct file *); | 180 | static int sync_serial_release(struct inode *, struct file *); |
181 | static unsigned int sync_serial_poll(struct file *filp, poll_table *wait); | 181 | static __poll_t sync_serial_poll(struct file *filp, poll_table *wait); |
182 | 182 | ||
183 | static long sync_serial_ioctl(struct file *file, | 183 | static long sync_serial_ioctl(struct file *file, |
184 | unsigned int cmd, unsigned long arg); | 184 | unsigned int cmd, unsigned long arg); |
@@ -555,13 +555,13 @@ static int sync_serial_release(struct inode *inode, struct file *file) | |||
555 | return 0; | 555 | return 0; |
556 | } | 556 | } |
557 | 557 | ||
558 | static unsigned int sync_serial_poll(struct file *file, poll_table *wait) | 558 | static __poll_t sync_serial_poll(struct file *file, poll_table *wait) |
559 | { | 559 | { |
560 | int dev = iminor(file_inode(file)); | 560 | int dev = iminor(file_inode(file)); |
561 | unsigned int mask = 0; | 561 | __poll_t mask = 0; |
562 | struct sync_port *port; | 562 | struct sync_port *port; |
563 | DEBUGPOLL( | 563 | DEBUGPOLL( |
564 | static unsigned int prev_mask; | 564 | static __poll_t prev_mask; |
565 | ); | 565 | ); |
566 | 566 | ||
567 | port = &ports[dev]; | 567 | port = &ports[dev]; |