From patchwork Mon Nov 16 01:12:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bongsu Jeon X-Patchwork-Id: 325174 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 75149C56202 for ; Mon, 16 Nov 2020 01:13:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B3802225B for ; Mon, 16 Nov 2020 01:13:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="Sj7Bqonb" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728343AbgKPBMN (ORCPT ); Sun, 15 Nov 2020 20:12:13 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:42602 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728046AbgKPBMM (ORCPT ); Sun, 15 Nov 2020 20:12:12 -0500 Received: from epcas2p3.samsung.com (unknown [182.195.41.55]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20201116011209epoutp01b4ae6178553a3a21ac624f3919166e69~H19tztuA02375623756epoutp01k for ; Mon, 16 Nov 2020 01:12:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20201116011209epoutp01b4ae6178553a3a21ac624f3919166e69~H19tztuA02375623756epoutp01k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1605489129; bh=JHbfhQmZY2Kdf9uCqVWWi/pKiuSfpP7K0ZJj50SZUM0=; h=Subject:Reply-To:From:To:CC:Date:References:From; b=Sj7BqonbIBGAHQz2fHC7z7K6ep1nqPfCwRcej9eg8I3IyTNfq3231KzP8VHZ6XKMx METiEXeFSOidMeLvIcuecRAwzssjKj6xSeIFH7fTJx5HcT1r693OrTssrwSIXyrHZb ldU7AVV3niBWHe/tE6jKWXrsq5AAb3osmwBVVokk= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20201116011209epcas2p1a3b5e55645a2cc736315a93e787cac5a~H19terjmG1868518685epcas2p1g; Mon, 16 Nov 2020 01:12:09 +0000 (GMT) Received: from epsmges2p1.samsung.com (unknown [182.195.40.186]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4CZ9yv6qqDzMqYkb; Mon, 16 Nov 2020 01:12:07 +0000 (GMT) X-AuditID: b6c32a45-34dff7000001297d-aa-5fb1d1e5d539 Received: from epcas2p4.samsung.com ( [182.195.41.56]) by epsmges2p1.samsung.com (Symantec Messaging Gateway) with SMTP id DE.16.10621.5E1D1BF5; Mon, 16 Nov 2020 10:12:05 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH net-next 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: <20201116011205epcms2p566dbc946d6c7a0198d09b3a872e85f33@epcms2p5> Date: Mon, 16 Nov 2020 10:12:05 +0900 X-CMS-MailID: 20201116011205epcms2p566dbc946d6c7a0198d09b3a872e85f33 X-Sendblock-Type: AUTO_CONFIDENTIAL CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDKsWRmVeSWpSXmKPExsWy7bCmhe7TixvjDbZsMbPY0jyJ3eL2xGls FufPb2C3uLxrDpvFnA2b2S2OLRBzYPPYtKqTzaN79j8Wj74tqxg9Pm+SC2CJyrHJSE1MSS1S SM1Lzk/JzEu3VfIOjneONzUzMNQ1tLQwV1LIS8xNtVVy8QnQdcvMAdqtpFCWmFMKFApILC5W 0rezKcovLUlVyMgvLrFVSi1IySkwNCzQK07MLS7NS9dLzs+1MjQwMDIFqkzIyeiY2cBUcEK4 4v2NtYwNjBsFuhg5OSQETCRmn5zH3MXIxSEksINRovvlCvYuRg4OXgFBib87hEFqhAWcJKbe ucYCYgsJKEr87zjHBhHXlXjx9yiYzSagLbH2aCMTSKuIQIjEx75akJHMAqsZJTp/djJD7OKV mNH+lAXClpbYvnwrI4StIfFjWS9UjajEzdVv2WHs98fmQ9WISLTeOwtVIyjx4OduqLikxNt9 89hBlkkItDNKnP/5gw3CmcEocWrzX6gOfYnF51YwQTzmK3HxUBFImEVAVaJ/w0SoEheJKdv/ gC1mFpCX2P52DjNIObOApsT6XfogpoSAssSRWywQFXwSHYf/ssO8tWPeEyYIW1Wit/kLE8yL k2e3QJ3pIfF81342SBAGSry8cJdtAqPCLERAz0KydxbC3gWMzKsYxVILinPTU4uNCgyR43YT IzgZarnuYJz89oPeIUYmDsZDjBIczEoivC4mG+OFeFMSK6tSi/Lji0pzUosPMZoCfTyRWUo0 OR+YjvNK4g1NjczMDCxNLUzNjCyUxHlDV/bFCwmkJ5akZqemFqQWwfQxcXBKNTCtCtjEz8Zz YOKTB0frc45tmbXzrMZOORuz9SXsxdmXGnTvif7N4L90ktHVMqesLi+xk1vr+cz/CVtP+x5Z 7NFZ/SvB135+zXLT/3kxlg3C8RMnfc9+52AZ+8no1lyeqBx9G6OAc68XTuxS7AzUPrMr0tFF 6J75vdeXau1y9j6bX3lyK89UTl593uhTy+TmVTxuXXv50rWk3UyVHyYtXdmhMj910gaWBQlC +q5ap55eebbf83DcoVt90+Uq9s8r83WL2Nq0ddK2qa6l27k8a/02/lQ6PZcvYqbqkWR/fodZ zxef+K/Ls5T/Uds12zfLy1oKT7c3PFrnVH7PcGVj2Xv+mSkSrB2O8RpKv86zfluixFKckWio xVxUnAgAMtbRag8EAAA= DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20201116011205epcms2p566dbc946d6c7a0198d09b3a872e85f33 References: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org max_payload is unused. 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 Mon Nov 16 01:19:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bongsu Jeon X-Patchwork-Id: 325173 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 DB3B2C63699 for ; Mon, 16 Nov 2020 01:20:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2E69C22265 for ; Mon, 16 Nov 2020 01:20:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="AJf1jrN+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728377AbgKPBT5 (ORCPT ); Sun, 15 Nov 2020 20:19:57 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:47882 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727893AbgKPBT4 (ORCPT ); Sun, 15 Nov 2020 20:19:56 -0500 Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20201116011954epoutp01bb3cdb8edcc6c34540cfb8fc7f293eea~H2EegBMAh3062230622epoutp013 for ; Mon, 16 Nov 2020 01:19:54 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20201116011954epoutp01bb3cdb8edcc6c34540cfb8fc7f293eea~H2EegBMAh3062230622epoutp013 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1605489594; bh=HH/NqwyXdWOgWXZb8phOo0tVJ5pPS37tojmhBry9IvY=; h=Subject:Reply-To:From:To:CC:Date:References:From; b=AJf1jrN+MPwj17Pebq7AFONzlWnIX58V4UIBqkHw1rwHpAKPLIGU5CEdURTqVcgoo 3xrFKnp/nL1EmCSp5N1lXIABmKAtJGSSk7ZR5yujsoV3O96gEhO9u67G9GNnRwBl+R BMdSF2bztodBWkyQdpw7YENUqPEV3c1SflIrl/jw= Received: from epsnrtp3.localdomain (unknown [182.195.42.164]) by epcas2p4.samsung.com (KnoxPortal) with ESMTP id 20201116011953epcas2p4bb2622adcfcb83d735de67dae93eee0f~H2Ed_hDkX1627416274epcas2p42; Mon, 16 Nov 2020 01:19:53 +0000 (GMT) Received: from epsmges2p1.samsung.com (unknown [182.195.40.182]) by epsnrtp3.localdomain (Postfix) with ESMTP id 4CZB7q64bjzMqYks; Mon, 16 Nov 2020 01:19:51 +0000 (GMT) X-AuditID: b6c32a45-34dff7000001297d-04-5fb1d3b7d007 Received: from epcas2p1.samsung.com ( [182.195.41.53]) by epsmges2p1.samsung.com (Symantec Messaging Gateway) with SMTP id D4.2A.10621.7B3D1BF5; Mon, 16 Nov 2020 10:19:51 +0900 (KST) Mime-Version: 1.0 Subject: [PATCH net-next 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: <20201116011950epcms2p68117cc4a7228db2baecb7d4a4840b955@epcms2p6> Date: Mon, 16 Nov 2020 10:19:50 +0900 X-CMS-MailID: 20201116011950epcms2p68117cc4a7228db2baecb7d4a4840b955 X-Sendblock-Type: AUTO_CONFIDENTIAL CMS-TYPE: 102P X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNKsWRmVeSWpSXmKPExsWy7bCmqe72yxvjDVatZLPY0jyJ3eL2xGls FufPb2C3uLxrDpvFnA2b2S2OLRBzYPPYtKqTzaN79j8Wj74tqxg9Pm+SC2CJyrHJSE1MSS1S SM1Lzk/JzEu3VfIOjneONzUzMNQ1tLQwV1LIS8xNtVVy8QnQdcvMAdqtpFCWmFMKFApILC5W 0rezKcovLUlVyMgvLrFVSi1IySkwNCzQK07MLS7NS9dLzs+1MjQwMDIFqkzIyei6uJG5YB1P xZ/2V8wNjGu4uhg5OSQETCSuT7rA2sXIxSEksINR4vXCJ0xdjBwcvAKCEn93CIPUCAs4SrQs uc8OYgsJKEr87zjHBhHXlXjx9yiYzSagLbH2aCNYq4hAiMTHvlqQkcwCqxklOn92MkPs4pWY 0f6UBcKWlti+fCsjhK0h8WNZL1SNqMTN1W/ZYez3x+ZD1YhItN47C1UjKPHg526ouKTE233z 2EGWSQi0M0qc//mDDcKZwShxavNfqA59icXnVkA95itx8407iMkioCqx+Y4vRIWLRPf12WDV zALyEtvfzmEGKWEW0JRYv0sfxJQQUJY4cosFooJPouPwX3aYr3bMAwUaiK0q0dv8hQnmw8mz W6Cu9JD4cPcJNAQDJX58Xck0gVFhFiKcZyHZOwth7wJG5lWMYqkFxbnpqcVGBYbIUbuJEZwK tVx3ME5++0HvECMTB+MhRgkOZiURXheTjfFCvCmJlVWpRfnxRaU5qcWHGE2BHp7ILCWanA9M xnkl8YamRmZmBpamFqZmRhZK4ryhK/vihQTSE0tSs1NTC1KLYPqYODilGpg21l12f7dmdeNu 9kfLeaYueHfs0pPzalI7jwUn9Eh2lllMPzjlq9yk298kSh5tD1E+drSa5Xn4wd/2CRuCubcu k9mZuCQ/xH3VPs+NJ+p5jvzRvcI+u4xF7JKQ8snzG+yOsZwPWTtxOsPr9FyNEPsJZzdtWF/2 nGPaqufvIrZm9Sy3uvcm/4/cP7V2zjX1RW67K/aphhTLlV6LvCc4pbmIh8+8xVGwUPDQBhXm dQe/rTH9bv1TxdMuKfhp2eTKToYOroZQKZNPjIF+zYuzX35smjnt6oU9EwOna/5YY9R/1kfs 7db+5TY31mu5fWW0TJq0bktfk5zFGcdHtx5NXbVfTqr22ZPLRoyufOc1jeJvKrEUZyQaajEX FScCAI8AYPcOBAAA DLP-Filter: Pass X-CFilter-Loop: Reflected X-CMS-RootMailID: 20201116011950epcms2p68117cc4a7228db2baecb7d4a4840b955 References: Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ENOTSUPP is not a SUSV4 error code, prefer EOPNOTSUPP. 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); }