From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jeffery Date: Wed, 20 Nov 2019 16:14:12 +1030 Subject: [PATCH] aspeed: fix snoop_file_poll()'s return type In-Reply-To: <20191120000647.30551-1-luc.vanoostenryck@gmail.com> References: <20191120000647.30551-1-luc.vanoostenryck@gmail.com> Message-ID: <787e54c2-2fe3-4afc-a69b-94771726194b@www.fastmail.com> List-Id: To: linux-aspeed@lists.ozlabs.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Wed, 20 Nov 2019, at 10:36, Luc Van Oostenryck wrote: > 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. > > CC: Joel Stanley > CC: Andrew Jeffery > CC: linux-aspeed at lists.ozlabs.org > CC: linux-arm-kernel at lists.infradead.org > Signed-off-by: Luc Van Oostenryck > --- > drivers/soc/aspeed/aspeed-lpc-snoop.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > 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; Looks fine to me as POLLIN and EPOLLIN evaluate to the same value despite the type difference. Patrick, Rob: can you take a look / test? Andrew