diff mbox series

soc: aspeed: Fix snoop_file_poll()'s return type

Message ID 20191121051851.268726-1-joel@jms.id.au (mailing list archive)
State Mainlined
Commit a4e55ccd4392e70f296d12e81b93c6ca96ee21d5
Headers show
Series soc: aspeed: Fix snoop_file_poll()'s return type | expand

Commit Message

Joel Stanley Nov. 21, 2019, 5:18 a.m. UTC 
From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>

snoop_file_poll() is defined as returning 'unsigned int' but the
.poll method is declared as returning '__poll_t', a bitwise type.

Fix this by using the proper return type and using the EPOLL
constants instead of the POLL ones, as required for __poll_t.

Fixes: 3772e5da4454 ("drivers/misc: Aspeed LPC snoop output using misc chardev")
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
---
Hi ARM maintainers, can you please queue this one up for 5.5?

 drivers/soc/aspeed/aspeed-lpc-snoop.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

patchwork-bot+linux-soc@kernel.org Dec. 5, 2019, 6:22 p.m. UTC | #1 
Hello:

This patch was applied to soc/soc.git (refs/heads/arm/fixes).

On Thu, 21 Nov 2019 15:48:51 +1030 you wrote:
> From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
> 
> snoop_file_poll() is defined as returning 'unsigned int' but the
> .poll method is declared as returning '__poll_t', a bitwise type.
> 
> Fix this by using the proper return type and using the EPOLL
> constants instead of the POLL ones, as required for __poll_t.
> 
> [...]


Here is a summary with links:
  - soc: aspeed: Fix snoop_file_poll()'s return type
    https://git.kernel.org/soc/soc/c/a4e55ccd4392e70f296d12e81b93c6ca96ee21d5

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c
index 48f7ac238861..f3d8d53ab84d 100644
--- a/drivers/soc/aspeed/aspeed-lpc-snoop.c
+++ b/drivers/soc/aspeed/aspeed-lpc-snoop.c
@@ -97,13 +97,13 @@  static ssize_t snoop_file_read(struct file *file, char __user *buffer,
 	return ret ? ret : copied;
 }
 
-static unsigned int snoop_file_poll(struct file *file,
+static __poll_t snoop_file_poll(struct file *file,
 				    struct poll_table_struct *pt)
 {
 	struct aspeed_lpc_snoop_channel *chan = snoop_file_to_chan(file);
 
 	poll_wait(file, &chan->wq, pt);
-	return !kfifo_is_empty(&chan->fifo) ? POLLIN : 0;
+	return !kfifo_is_empty(&chan->fifo) ? EPOLLIN : 0;
 }
 
 static const struct file_operations snoop_fops = {