Received: by 10.223.176.46 with SMTP id f43csp3335740wra; Mon, 22 Jan 2018 12:19:59 -0800 (PST) X-Google-Smtp-Source: AH8x227gDSeGWnoYEArTuFbVaRG4PSfj57riCb8yI5VMAzN07MVmHzLzu3ws/UX8C6+Uh6D80PSM X-Received: by 10.107.165.19 with SMTP id o19mr109348ioe.87.1516652398804; Mon, 22 Jan 2018 12:19:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516652398; cv=none; d=google.com; s=arc-20160816; b=OTLif3Vhm6Vkx+24+XFka+nOk1SmkQsIqY5YK+J2jog8Dj2IUcZ1ZVEym6+etHVU8T esk8+RFtBXlH+s63Ss+I89RHfXthK85NgLxBJNBWXJQqexwTCWOF/5rL6Ug6CN9/JmN4 7aw/1H/9uTLaUB75xnxciN/HF13HSOf/JayXww/MoxAreIYSZfyBehIjvff+oU7Lb7FB 0msYc8jaiVenhW6H3aBnr0W0kvmVPl9Z6qb7zxZXeK6fxGZklJaEUKBL68MAGOkajW5z 6bIlBjLWnxw3nvRWb9WN02peotZJohB974E5QIeN4SbDwdhYlBbgb7Ez+cIzsY0wFggN wQpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=Q9t3MUTs+KvnMJKAtZOE43UuYXVbXCddPhUMelXkqJU=; b=TxemxRH4GZMdOhI3jTVoYJqP4vxCLrVhgwM28k5c7xeWrQ2utsJtQNYsMrBPWKHDnz umENnIcCEA7N4aZDusgyx0tYu0psAWLssLRkZoScWLP79SGX5ktOTB7rvuNub2L1Irse ac0Q6PMjoAepo402ZnWDk1yWx8haCayTGQMbY52BTdKaAtMiyAo84UeIK71gVqgmo49T QsGsoX93uFkF0AinZY3C0copu2sOHFonAc47KPjFmAy1GfRySCZlmUDvVOTc8eKNo2TV b+OGwf8mrOMrjo2PBMvggDinPtpzEgF+p4oKi9OhxxRq1fE4NHi6Q7FsZXPvbOk2jBkK EU6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=VcjoI0bP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p125si6524110itb.143.2018.01.22.12.19.45; Mon, 22 Jan 2018 12:19:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=VcjoI0bP; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751883AbeAVUOW (ORCPT + 99 others); Mon, 22 Jan 2018 15:14:22 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:50081 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751846AbeAVUOT (ORCPT ); Mon, 22 Jan 2018 15:14:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Q9t3MUTs+KvnMJKAtZOE43UuYXVbXCddPhUMelXkqJU=; b=VcjoI0bPk6KQoZXOxIEhbQPv0 riKrGpdKIAUbJSbz025kieJt1rM0/g2t+SlQN98p7TeBpBJU0olC/8xepKlDbnIXPfNAePt0Ge1Fz rhtG0fbrYcZzlu+JBSkRkuufYD0IieWKuFSxfGgAU9g7m8xyklBCrIy5FK+ptgjstlhdKkBF6M91g oKc+ujwCwB9b1sXAD8HypzVsCRpNDy7VeMpGWvCuDhCaSNp1k6+T87E4mqXjtfyhUnknpYOeqo7hv U6/wSpj2kqCgJOlWicS0wnSCt49MoxmUyBHIZRLpXlEH9hiCpp4qDq2H4MhjdHvosXN8/3TpJha9E uEkO9IQqA==; Received: from 178.114.226.247.wireless.dyn.drei.com ([178.114.226.247] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.89 #1 (Red Hat Linux)) id 1ediTx-0007lE-71; Mon, 22 Jan 2018 20:14:17 +0000 From: Christoph Hellwig To: viro@zeniv.linux.org.uk Cc: Avi Kivity , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 28/36] net/nfc: convert to ->poll_mask Date: Mon, 22 Jan 2018 21:12:35 +0100 Message-Id: <20180122201243.31610-29-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180122201243.31610-1-hch@lst.de> References: <20180122201243.31610-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Christoph Hellwig --- net/nfc/llcp_sock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c index 985909f105eb..1ee9f35084b1 100644 --- a/net/nfc/llcp_sock.c +++ b/net/nfc/llcp_sock.c @@ -549,16 +549,13 @@ static inline __poll_t llcp_accept_poll(struct sock *parent) return 0; } -static __poll_t llcp_sock_poll(struct file *file, struct socket *sock, - poll_table *wait) +static __poll_t llcp_sock_poll_mask(struct socket *sock, __poll_t events) { struct sock *sk = sock->sk; __poll_t mask = 0; pr_debug("%p\n", sk); - sock_poll_wait(file, sk_sleep(sk), wait); - if (sk->sk_state == LLCP_LISTEN) return llcp_accept_poll(sk); @@ -900,7 +897,7 @@ static const struct proto_ops llcp_sock_ops = { .socketpair = sock_no_socketpair, .accept = llcp_sock_accept, .getname = llcp_sock_getname, - .poll = llcp_sock_poll, + .poll_mask = llcp_sock_poll_mask, .ioctl = sock_no_ioctl, .listen = llcp_sock_listen, .shutdown = sock_no_shutdown, @@ -920,7 +917,7 @@ static const struct proto_ops llcp_rawsock_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = llcp_sock_getname, - .poll = llcp_sock_poll, + .poll_mask = llcp_sock_poll_mask, .ioctl = sock_no_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, -- 2.14.2