From patchwork Tue Nov 17 08:08:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bongsu Jeon X-Patchwork-Id: 325053 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=unavailable 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 CD3D2C63777 for ; Tue, 17 Nov 2020 08:08:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 91DF3217A0 for ; Tue, 17 Nov 2020 08:08:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="vb+nLj+z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727141AbgKQIIb (ORCPT ); Tue, 17 Nov 2020 03:08:31 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:52040 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725613AbgKQIIa (ORCPT ); Tue, 17 Nov 2020 03:08:30 -0500 Received: from epcas2p1.samsung.com (unknown [182.195.41.53]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20201117080827epoutp032b226f3ad435f2e735884f4d6b2dff82~IPSeqMj0e2711027110epoutp03X for ; Tue, 17 Nov 2020 08:08:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20201117080827epoutp032b226f3ad435f2e735884f4d6b2dff82~IPSeqMj0e2711027110epoutp03X DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1605600507; bh=zJSngcK/bFdgmZup9U49BIcrgy3X3io44G95eX4tVAc=; h=Subject:Reply-To:From:To:CC:Date:References:From; b=vb+nLj+zJOXKX3mM9A8l4cpTJW8LpRmoFBDCI+05Zu178SthlWVW2YqQ8fqbi71MK Wk7eI3gh0jWSUoNS7bANu+dKAAIdYxznxf9SD31BGHnkWrFhDoIXjny/LnDDUr84bw VhMWFnD6wEqvIo6y7o0JqkrEJI1/W3ecbmfhyQR8= Received: from epsnrtp2.localdomain (unknown [182.195.42.163]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20201117080827epcas2p391726673adeb25b98f6733fcd99e36e1~IPSeTqOs42488224882epcas2p3d; Tue, 17 Nov 2020 08:08:27 +0000 (GMT) Received: from epsmges2p3.samsung.com (unknown [182.195.40.182]) by epsnrtp2.localdomain (Postfix) with ESMTP id 4CZz8n2xRPzMqYkg; Tue, 17 Nov 2020 08:08:25 +0000 (GMT) X-AuditID: b6c32a47-715ff7000000d2c4-8d-5fb384f84339 Received: from epcas2p2.samsung.com ( [182.195.41.54]) by epsmges2p3.samsung.com (Symantec Messaging Gateway) with SMTP id EA.C5.53956.8F483BF5; Tue, 17 Nov 2020 17:08:24 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH net-next v2 1/3] nfc: s3fwrn5: Remove the max_payload Reply-To: bongsu.jeon@samsung.com Sender: Bongsu Jeon From: Bongsu Jeon To: "krzk@kernel.org" , Krzysztof Opasiak CC: "linux-nfc@lists.01.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" X-Priority: 3 X-Content-Kind-Code: NORMAL X-CPGS-Detection: blocking_info_exchange X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20201117080824epcms2p36f70e06e2d8bd51d1af278b26ca65725@epcms2p3> Date: Tue, 17 Nov 2020 17:08:24 +0900 X-CMS-MailID: 20201117080824epcms2p36f70e06e2d8bd51d1af278b26ca65725 X-Sendblock-Type: AUTO_CONFIDENTIAL CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDKsWRmVeSWpSXmKPExsWy7bCmme6Pls3xBh/ua1lsaZ7EbnF74jQ2 i/PnN7BbXN41h81izobN7BbHFog5sHlsWtXJ5tE9+x+LR9+WVYwenzfJBbBE5dhkpCampBYp pOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAO1WUihLzCkFCgUkFhcr 6dvZFOWXlqQqZOQXl9gqpRak5BQYGhboFSfmFpfmpesl5+daGRoYGJkCVSbkZJydc5Cp4I9w xasDd5gbGB8IdDFyckgImEh82nCMvYuRi0NIYAejxOV7O1i6GDk4eAUEJf7uEAapERZwldh8 fSUbiC0koCjxv+McG0RcV+LF36NgNpuAtsTao41MIK0iAiESH/tqQUYyC6xmlOj82ckMsYtX Ykb7UxYIW1pi+/KtjBC2hsSPZb1QNaISN1e/ZYex3x+bD1UjItF67yxUjaDEg5+7oeKSEm/3 zQO7X0KgnVHi/M8fbBDODEaJU5v/QnXoSyw+t4IJxOYV8JX41/UHLM4ioCrR0n+IDeRqCQEX ib1rFUDCzALyEtvfzmEGCTMLaEqs36UPUaEsceQWC0QFn0TH4b/sMG/tmPeECcJWleht/sIE 8+Lk2S1QZ3pIfJtwiQUShIESv//eYpzAqDALEdCzkOydhbB3ASPzKkax1ILi3PTUYqMCY+S4 3cQIToZa7jsYZ7z9oHeIkYmD8RCjBAezkgivi8nGeCHelMTKqtSi/Pii0pzU4kOMpkAPT2SW Ek3OB6bjvJJ4Q1MjMzMDS1MLUzMjCyVx3tCVffFCAumJJanZqakFqUUwfUwcnFINTOm1+ekb pXjfaH9wyQyYc0htOdfHBxFP/VPvzM3l/1/247ybTuL37bOTq+/d+ZdlVVMql1kV9u7T7yNn zxd1vXVetX/LT1cPLqull51C41Y8vsfj94JT6774swreawIKKffWdsTO4FL4cYX50CPXzQ4T 1e3EFjRZLpxreuXVvYs8h3T6364RUme/0DBZdYdOgJeD9NWALd4qktdVy2bJTGY12tJgcGjl 5cQlD2yyTU+ZreQ8bi+QvuOhorn20ZiYMOPwj361P79mSWswf5pp2+WvfIBtznxGXqWXs/OO VuzaInot1vzd5O1X85wnmrgnMD3O6eDRfZ1qckayVT1IZrN4XqiV7A6HfP5v+3jylFiKMxIN tZiLihMBHW8PgQ8EAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20201117080824epcms2p36f70e06e2d8bd51d1af278b26ca65725 References: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org max_payload is unused. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bongsu Jeon --- drivers/nfc/s3fwrn5/core.c | 3 +-- drivers/nfc/s3fwrn5/i2c.c | 4 +--- drivers/nfc/s3fwrn5/s3fwrn5.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/nfc/s3fwrn5/core.c b/drivers/nfc/s3fwrn5/core.c index ba6c486d6465..f8e5d78d9078 100644 --- a/drivers/nfc/s3fwrn5/core.c +++ b/drivers/nfc/s3fwrn5/core.c @@ -136,7 +136,7 @@ static struct nci_ops s3fwrn5_nci_ops = { }; int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, - const struct s3fwrn5_phy_ops *phy_ops, unsigned int max_payload) + const struct s3fwrn5_phy_ops *phy_ops) { struct s3fwrn5_info *info; int ret; @@ -148,7 +148,6 @@ int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, info->phy_id = phy_id; info->pdev = pdev; info->phy_ops = phy_ops; - info->max_payload = max_payload; mutex_init(&info->mutex); s3fwrn5_set_mode(info, S3FWRN5_MODE_COLD); diff --git a/drivers/nfc/s3fwrn5/i2c.c b/drivers/nfc/s3fwrn5/i2c.c index dc995286be84..0ffa389066a0 100644 --- a/drivers/nfc/s3fwrn5/i2c.c +++ b/drivers/nfc/s3fwrn5/i2c.c @@ -19,7 +19,6 @@ #define S3FWRN5_I2C_DRIVER_NAME "s3fwrn5_i2c" -#define S3FWRN5_I2C_MAX_PAYLOAD 32 #define S3FWRN5_EN_WAIT_TIME 150 struct s3fwrn5_i2c_phy { @@ -248,8 +247,7 @@ static int s3fwrn5_i2c_probe(struct i2c_client *client, if (ret < 0) return ret; - ret = s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops, - S3FWRN5_I2C_MAX_PAYLOAD); + ret = s3fwrn5_probe(&phy->ndev, phy, &phy->i2c_dev->dev, &i2c_phy_ops); if (ret < 0) return ret; diff --git a/drivers/nfc/s3fwrn5/s3fwrn5.h b/drivers/nfc/s3fwrn5/s3fwrn5.h index ede68bb5eeae..9d5f34759225 100644 --- a/drivers/nfc/s3fwrn5/s3fwrn5.h +++ b/drivers/nfc/s3fwrn5/s3fwrn5.h @@ -34,7 +34,6 @@ struct s3fwrn5_info { struct device *pdev; const struct s3fwrn5_phy_ops *phy_ops; - unsigned int max_payload; struct s3fwrn5_fw_info fw_info; @@ -79,7 +78,7 @@ static inline int s3fwrn5_write(struct s3fwrn5_info *info, struct sk_buff *skb) } int s3fwrn5_probe(struct nci_dev **ndev, void *phy_id, struct device *pdev, - const struct s3fwrn5_phy_ops *phy_ops, unsigned int max_payload); + const struct s3fwrn5_phy_ops *phy_ops); void s3fwrn5_remove(struct nci_dev *ndev); int s3fwrn5_recv_frame(struct nci_dev *ndev, struct sk_buff *skb, From patchwork Tue Nov 17 08:11:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bongsu Jeon X-Patchwork-Id: 325052 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=-9.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED 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 E562EC63777 for ; Tue, 17 Nov 2020 08:11:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7CBDB22447 for ; Tue, 17 Nov 2020 08:11:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="Tgjr7HS6" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727167AbgKQILm (ORCPT ); Tue, 17 Nov 2020 03:11:42 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:54605 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727141AbgKQILm (ORCPT ); Tue, 17 Nov 2020 03:11:42 -0500 Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20201117081139epoutp03849a3ca5f220a714f808eb1915aa3c8b~IPVRkdpVx3004130041epoutp03c for ; Tue, 17 Nov 2020 08:11:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20201117081139epoutp03849a3ca5f220a714f808eb1915aa3c8b~IPVRkdpVx3004130041epoutp03c DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1605600699; bh=4yuXaRyIkw7lnb4zJhKZ/Mit84x8WVY+2eudUg0qOyo=; h=Subject:Reply-To:From:To:CC:Date:References:From; b=Tgjr7HS6/g046xJBZ8GjL8WxSNUisCJHqt1vFM5jYij1TBQ+8mJW7ljMAxCy0E7bX a56iyNcM2YieEgFIZLjMS666yCEaBZzssSi5uXxJKi4TecXpolyFC91QJ/KfXvwWGg +uVz3J8xPAQBe/6STPk4Kl0vSjKz8lmO12c76iJU= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas2p2.samsung.com (KnoxPortal) with ESMTP id 20201117081139epcas2p2db4464cd223dbb80ab733a9721e190d0~IPVRNuedG1608616086epcas2p2e; Tue, 17 Nov 2020 08:11:39 +0000 (GMT) Received: from epsmges2p2.samsung.com (unknown [182.195.40.187]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4CZzDV1YLpzMqYkZ; Tue, 17 Nov 2020 08:11:38 +0000 (GMT) X-AuditID: b6c32a46-1efff7000000dbf8-13-5fb385b9df33 Received: from epcas2p1.samsung.com ( [182.195.41.53]) by epsmges2p2.samsung.com (Symantec Messaging Gateway) with SMTP id 67.9B.56312.9B583BF5; Tue, 17 Nov 2020 17:11:37 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH net-next v2 3/3] nfc: s3fwrn5: Change the error code Reply-To: bongsu.jeon@samsung.com Sender: Bongsu Jeon From: Bongsu Jeon To: "krzk@kernel.org" , Krzysztof Opasiak CC: "linux-nfc@lists.01.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" X-Priority: 3 X-Content-Kind-Code: NORMAL X-CPGS-Detection: blocking_info_exchange X-Drm-Type: N,general X-Msg-Generator: Mail X-Msg-Type: PERSONAL X-Reply-Demand: N Message-ID: <20201117081137epcms2p84b5dd8d84ca608f44b0bb722b48f50b1@epcms2p8> Date: Tue, 17 Nov 2020 17:11:37 +0900 X-CMS-MailID: 20201117081137epcms2p84b5dd8d84ca608f44b0bb722b48f50b1 X-Sendblock-Type: AUTO_CONFIDENTIAL CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLKsWRmVeSWpSXmKPExsWy7bCmqe7O1s3xBos3aFtsaZ7EbnF74jQ2 i/PnN7BbXN41h81izobN7BbHFog5sHlsWtXJ5tE9+x+LR9+WVYwenzfJBbBE5dhkpCampBYp pOYl56dk5qXbKnkHxzvHm5oZGOoaWlqYKynkJeam2iq5+AToumXmAO1WUihLzCkFCgUkFhcr 6dvZFOWXlqQqZOQXl9gqpRak5BQYGhboFSfmFpfmpesl5+daGRoYGJkCVSbkZHw5vJa94BFP xbGzTxkbGG9zdTFyckgImEi8/bmEqYuRi0NIYAejxNPHh9m7GDk4eAUEJf7uEAapERZwkeh9 cpUNxBYSUJT433GODSKuK/Hi71Ewm01AW2Lt0UYmkFYRgRCJj321ICOZBVYzSnT+7GSG2MUr MaP9KQuELS2xfflWRghbQ+LHsl6oGlGJm6vfssPY74/Nh6oRkWi9dxaqRlDiwc/dUHFJibf7 5rGDLJMQaGeUOP/zBxuEM4NR4tTmv1Ad+hKLz61gArF5BXwl1r6YC7aBRUBVov35HKhtLhLX 568Hm8osIC+x/e0cZpBvmAU0Jdbv0gcxJQSUJY7cYoGo4JPoOPyXHeavHfOeMEHYqhK9zV+Y YH6cPLsF6k4Pia1fjzFDwjBQYsXnDuYJjAqzECE9C8neWQh7FzAyr2IUSy0ozk1PLTYqMEKO 3E2M4HSo5baDccrbD3qHGJk4GA8xSnAwK4nwuphsjBfiTUmsrEotyo8vKs1JLT7EaAr08URm KdHkfGBCziuJNzQ1MjMzsDS1MDUzslAS5w1d2RcvJJCeWJKanZpakFoE08fEwSnVwBT2u9Hc P09m1SHn/cxTnRnfs37YsEPnVuG8b98aLeeUCd+3O7hD7kiR9fMJKxglfbT5Jq63zkxr9fww f8WkhUEzZkbPb34xa+py02lhrkHFk/lPveZ8nW+mzabAozWnMCs1lGWWgV/ilsSwxPAl+fqq u3V+vTrqKlrh2B129f62t9Mqri58IZP7VDLz7QrHdndW35XzruTk/FhQfo7hVtU3ab71u5z8 3XmPSP+aqrT5WvG5E4/XKs3TPSYn9IqnlNW4P3n2R4/7C3YEBT2IsTj32OuimnVH8YOPpy5l /TKoX5yy7mPlkdun89bKXq9aMUl7n9H61deKNIKjp9jO7WnQYkhv1GEU79y67pfEBFUlluKM REMt5qLiRABKcRNLEAQAAA== DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20201117081137epcms2p84b5dd8d84ca608f44b0bb722b48f50b1 References: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ENOTSUPP is not a SUSV4 error code, prefer EOPNOTSUPP. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Bongsu Jeon --- drivers/nfc/s3fwrn5/s3fwrn5.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/nfc/s3fwrn5/s3fwrn5.h b/drivers/nfc/s3fwrn5/s3fwrn5.h index 9d5f34759225..bb8f936d13a2 100644 --- a/drivers/nfc/s3fwrn5/s3fwrn5.h +++ b/drivers/nfc/s3fwrn5/s3fwrn5.h @@ -44,7 +44,7 @@ static inline int s3fwrn5_set_mode(struct s3fwrn5_info *info, enum s3fwrn5_mode mode) { if (!info->phy_ops->set_mode) - return -ENOTSUPP; + return -EOPNOTSUPP; info->phy_ops->set_mode(info->phy_id, mode); @@ -54,7 +54,7 @@ static inline int s3fwrn5_set_mode(struct s3fwrn5_info *info, static inline enum s3fwrn5_mode s3fwrn5_get_mode(struct s3fwrn5_info *info) { if (!info->phy_ops->get_mode) - return -ENOTSUPP; + return -EOPNOTSUPP; return info->phy_ops->get_mode(info->phy_id); } @@ -62,7 +62,7 @@ static inline enum s3fwrn5_mode s3fwrn5_get_mode(struct s3fwrn5_info *info) static inline int s3fwrn5_set_wake(struct s3fwrn5_info *info, bool wake) { if (!info->phy_ops->set_wake) - return -ENOTSUPP; + return -EOPNOTSUPP; info->phy_ops->set_wake(info->phy_id, wake); @@ -72,7 +72,7 @@ static inline int s3fwrn5_set_wake(struct s3fwrn5_info *info, bool wake) static inline int s3fwrn5_write(struct s3fwrn5_info *info, struct sk_buff *skb) { if (!info->phy_ops->write) - return -ENOTSUPP; + return -EOPNOTSUPP; return info->phy_ops->write(info->phy_id, skb); }