From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 41BA5C2D0CE for ; Fri, 24 Jan 2020 09:39:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 064F32070A for ; Fri, 24 Jan 2020 09:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858743; bh=IDPc5W3c9zloz6J8mDqV2DFGPhxwX9+pXEs2XoqPhfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=GmxQnkfHviF0T9P5mdm5F6NCQbuuC2XDYDOV2Sr5xlY7MnC4oDimVDbr6sLxVzbSD mPplTw52taXZXv5kD8M4kUuGSjDTHNy5un/UeXSwOMn0bjNcfQvn86mlUdKjdDloa7 c/1L/8PFa6G1qYtWtkO3KxaO2f79+TonzMUEh0VA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730410AbgAXJjC (ORCPT ); Fri, 24 Jan 2020 04:39:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:36154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729924AbgAXJjC (ORCPT ); Fri, 24 Jan 2020 04:39:02 -0500 Received: from localhost (unknown [145.15.244.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D5EA120709; Fri, 24 Jan 2020 09:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579858741; bh=IDPc5W3c9zloz6J8mDqV2DFGPhxwX9+pXEs2XoqPhfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YciUv9VZmu21+zFYIwieZtBhpNoNBlSSmeYsk00gXrZMhhPZ3omU6MMgMiDLJpZVf CKqPgbegK/kpErFk45be0YFvTEe5Of381Q5dQVzHPdM8+zJCCgRsyOSandOfxE0h2W SCBJ+FL/NLaZRNxMHVQrDc/WyuVRBOhQQsBcM+Ks= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luc Van Oostenryck , Joel Stanley , Andrew Jeffery , Olof Johansson Subject: [PATCH 5.4 044/102] soc: aspeed: Fix snoop_file_poll()s return type Date: Fri, 24 Jan 2020 10:30:45 +0100 Message-Id: <20200124092812.933973706@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092806.004582306@linuxfoundation.org> References: <20200124092806.004582306@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luc Van Oostenryck commit a4e55ccd4392e70f296d12e81b93c6ca96ee21d5 upstream. 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. Link: https://lore.kernel.org/r/20191121051851.268726-1-joel@jms.id.au Fixes: 3772e5da4454 ("drivers/misc: Aspeed LPC snoop output using misc chardev") Signed-off-by: Luc Van Oostenryck Reviewed-by: Joel Stanley Reviewed-by: Andrew Jeffery Signed-off-by: Joel Stanley Signed-off-by: Olof Johansson Signed-off-by: Greg Kroah-Hartman --- drivers/soc/aspeed/aspeed-lpc-snoop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- 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 fi 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 = {