From patchwork Tue Dec 15 06:54:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bongsu Jeon X-Patchwork-Id: 344900 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D1260C4361B for ; Tue, 15 Dec 2020 06:56:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 885FA22286 for ; Tue, 15 Dec 2020 06:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726723AbgLOGzP (ORCPT ); Tue, 15 Dec 2020 01:55:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725890AbgLOGzA (ORCPT ); Tue, 15 Dec 2020 01:55:00 -0500 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3762C0617A6; Mon, 14 Dec 2020 22:54:34 -0800 (PST) Received: by mail-pj1-x1044.google.com with SMTP id j13so8358744pjz.3; Mon, 14 Dec 2020 22:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nIjZP5Lkybwz2c4aGlTZv0F588/auhsxru313pjOx5w=; b=KfjKWAEaC8+Nbkc22nUV0yrTvm9YpXoVUvMnHKcPuaBIY3UsVKMmTUw88yc+L9M8c4 qbGMToASI5aZ0368VTsqwXqJgDOJrzBsbEuqw26ZpXKBevmsnkH3btXUG3GaLOrW9N+a /jHPiWwXmu3SMAf8BYJsfbtrcwEkB0WkwAYXHvErpcjH9PiDjTcz4tq/+wLsYcPlbtjC YWQzlP1pph8wYeecPGt+075F7rDPJwz7RokKlMIUyHzwduCZTZENXgwinIUVpBY6N+2T ljPJhnFfDGXVT64sWbECaKCDTODWPHj85ML9J3XytDWX5iaRO9b5vvEKU1UJSZIsaXtW iy0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nIjZP5Lkybwz2c4aGlTZv0F588/auhsxru313pjOx5w=; b=sAYpATPtN12+cRTzszJPuuv8i+GZaaw7We89AyVhntMdn3NAl91qIkIDeHgBIKtfRV XfF+uZadtGOooAxP2aXq5x3vXZFwuL0IRUZ3yLslgYhl0D/XWOd1kdQ+v3T2USiPPbTv U7Ku2tfosh06+aXQmP3Ofts6FOA3mSSHnJxDgJIG7sQrnXRTJoU7R9cIrqyicYCxTXNc 5Ck/hM6zJSmlc4IkR89OG+HaxCHxemft+Ya2LbW0TN9/0d4FItBcmoSOlb+R1qkRKm0y mRbQ/k7oj2hvkaoXGtZTWjIdhpwejAclxZM11IfeKwvOiDqD4/xIdFXcgB9L7sfHyOyA bNCw== X-Gm-Message-State: AOAM5325Nqx54EOvL9xsOuk4HXQDenPsytujANvJr3KX/1x72jwa58tg p1NkVLnJqfOlkQ9LmVfHPp8= X-Google-Smtp-Source: ABdhPJySuEAvZQpZgPTFQJ79CJff9QOdfof/7bZnikPspsKE3ZyoWZv6zT3Tj3k2p9g1CYqkh0gdGA== X-Received: by 2002:a17:90b:697:: with SMTP id m23mr28565098pjz.35.1608015274584; Mon, 14 Dec 2020 22:54:34 -0800 (PST) Received: from localhost.localdomain ([182.226.226.37]) by smtp.googlemail.com with ESMTPSA id na6sm19124134pjb.12.2020.12.14.22.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 22:54:33 -0800 (PST) From: Bongsu Jeon X-Google-Original-From: Bongsu Jeon To: krzk@kernel.org Cc: linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bongsu Jeon Subject: [PATCH v2 net-next 1/2] nfc: s3fwrn5: Remove the delay for NFC sleep Date: Tue, 15 Dec 2020 15:54:00 +0900 Message-Id: <20201215065401.3220-2-bongsu.jeon@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215065401.3220-1-bongsu.jeon@samsung.com> References: <20201215065401.3220-1-bongsu.jeon@samsung.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bongsu Jeon Remove the delay for NFC sleep because the delay is only needed to guarantee that the NFC is awake. Signed-off-by: Bongsu Jeon --- drivers/nfc/s3fwrn5/phy_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nfc/s3fwrn5/phy_common.c b/drivers/nfc/s3fwrn5/phy_common.c index 497b02b30ae7..81318478d5fd 100644 --- a/drivers/nfc/s3fwrn5/phy_common.c +++ b/drivers/nfc/s3fwrn5/phy_common.c @@ -20,7 +20,8 @@ void s3fwrn5_phy_set_wake(void *phy_id, bool wake) mutex_lock(&phy->mutex); gpio_set_value(phy->gpio_fw_wake, wake); - msleep(S3FWRN5_EN_WAIT_TIME); + if (wake) + msleep(S3FWRN5_EN_WAIT_TIME); mutex_unlock(&phy->mutex); } EXPORT_SYMBOL(s3fwrn5_phy_set_wake); From patchwork Tue Dec 15 06:54:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bongsu Jeon X-Patchwork-Id: 344335 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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 88B18C4361B for ; Tue, 15 Dec 2020 06:56:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6052022285 for ; Tue, 15 Dec 2020 06:56:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726719AbgLOGz0 (ORCPT ); Tue, 15 Dec 2020 01:55:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726697AbgLOGzI (ORCPT ); Tue, 15 Dec 2020 01:55:08 -0500 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E756EC0617A7; Mon, 14 Dec 2020 22:54:42 -0800 (PST) Received: by mail-pf1-x441.google.com with SMTP id c79so13908284pfc.2; Mon, 14 Dec 2020 22:54:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=29XGAclPGmuftpF/yRuuyN4mHi9SUrsaBzPMlpIbVk4=; b=Y0sWTMz3GtOW+SmGW4/kBQJooG9l5zU2ce4DP/GKIYB+vbXPrAH41sdsKeo8StG2eX D9aMgLppBy3WnWpz3ZPZ/sCD6cu5FNjJJIriBodjw2Fg9XZRKywOKgPF9/Y8ksiEsBtC Fb8AftFmxDA/c66vElS+bcBszXqyyh7YLHIxQdsnJoTwb6AgCK7C6Kk8ecJo0V0uuYbb MTaMLK3zo9/Z5ndLVpk/JcRcww+cIR5WKh9wZolHRjA2ezytLPfkeZ1iiO60x4T5ODlb c3oW5ZqQftlnbrcTpA4cTS1m+ufokdEDI6s05q6dyI9AavCbRV7blRHIVecmIdgNpZTq Fi4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=29XGAclPGmuftpF/yRuuyN4mHi9SUrsaBzPMlpIbVk4=; b=MSr4kVDxnPHUtSXJpSRSxr8CSOKuy7Flk9jf/gLniRqcNjvJmCN7Ao4IMGECKlECsI nSQQSPB5Ukvw07L169Sg5Y/B0uTgcl4C+tvm3FmFQ89pXWXvIEAea1gynT2rdefvk5+2 67GfIVm5KtSAEdNuAeCa6zyOH1OUcmDJ2bs6InqBKMuW53mVwfxyhHM4OGmtJGuQGKPl Aob5mBlvY7sqwakUVhsDZRwVaFq25Hyrg5StJ2X2eQFf1IR2l534VQJ4KGN0mB3XWCmC AQkazV/dRBW04N3Ahk+Q2P3/FxxdwlkndWB5CENJF5JD8TkkuVvnpvHbTBChsqfnS1Eh dRhw== X-Gm-Message-State: AOAM531hsDl27q1ieXWfhYvHXTXS5mmxL85tDO6sgq3XZ/eVzdCqBkgP bqTvYIxvOenrRwGnj/iBfOU= X-Google-Smtp-Source: ABdhPJz37IEUIyxeO+UQiYDgMJuF4g8CxUpaxXTiy5jOZ9RjJYgHKKxuGBsDrHgSR/uAKnRnWfrAag== X-Received: by 2002:a63:d542:: with SMTP id v2mr27601912pgi.250.1608015282364; Mon, 14 Dec 2020 22:54:42 -0800 (PST) Received: from localhost.localdomain ([182.226.226.37]) by smtp.googlemail.com with ESMTPSA id na6sm19124134pjb.12.2020.12.14.22.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 22:54:41 -0800 (PST) From: Bongsu Jeon X-Google-Original-From: Bongsu Jeon To: krzk@kernel.org Cc: linux-nfc@lists.01.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Bongsu Jeon Subject: [PATCH v2 net-next 2/2] nfc: s3fwrn5: Remove unused NCI prop commands Date: Tue, 15 Dec 2020 15:54:01 +0900 Message-Id: <20201215065401.3220-3-bongsu.jeon@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201215065401.3220-1-bongsu.jeon@samsung.com> References: <20201215065401.3220-1-bongsu.jeon@samsung.com> Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bongsu Jeon Remove the unused NCI prop commands that s3fwrn5 driver doesn't use. Signed-off-by: Bongsu Jeon --- drivers/nfc/s3fwrn5/nci.c | 25 ------------------------- drivers/nfc/s3fwrn5/nci.h | 22 ---------------------- 2 files changed, 47 deletions(-) diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c index 103bf5c92bdc..f042d3eaf8f6 100644 --- a/drivers/nfc/s3fwrn5/nci.c +++ b/drivers/nfc/s3fwrn5/nci.c @@ -21,31 +21,11 @@ static int s3fwrn5_nci_prop_rsp(struct nci_dev *ndev, struct sk_buff *skb) } static struct nci_driver_ops s3fwrn5_nci_prop_ops[] = { - { - .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, - NCI_PROP_AGAIN), - .rsp = s3fwrn5_nci_prop_rsp, - }, - { - .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, - NCI_PROP_GET_RFREG), - .rsp = s3fwrn5_nci_prop_rsp, - }, { .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, NCI_PROP_SET_RFREG), .rsp = s3fwrn5_nci_prop_rsp, }, - { - .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, - NCI_PROP_GET_RFREG_VER), - .rsp = s3fwrn5_nci_prop_rsp, - }, - { - .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, - NCI_PROP_SET_RFREG_VER), - .rsp = s3fwrn5_nci_prop_rsp, - }, { .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, NCI_PROP_START_RFREG), @@ -61,11 +41,6 @@ static struct nci_driver_ops s3fwrn5_nci_prop_ops[] = { NCI_PROP_FW_CFG), .rsp = s3fwrn5_nci_prop_rsp, }, - { - .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY, - NCI_PROP_WR_RESET), - .rsp = s3fwrn5_nci_prop_rsp, - }, }; void s3fwrn5_nci_get_prop_ops(struct nci_driver_ops **ops, size_t *n) diff --git a/drivers/nfc/s3fwrn5/nci.h b/drivers/nfc/s3fwrn5/nci.h index 23c0b28f247a..a80f0fb082a8 100644 --- a/drivers/nfc/s3fwrn5/nci.h +++ b/drivers/nfc/s3fwrn5/nci.h @@ -11,9 +11,6 @@ #include "s3fwrn5.h" -#define NCI_PROP_AGAIN 0x01 - -#define NCI_PROP_GET_RFREG 0x21 #define NCI_PROP_SET_RFREG 0x22 struct nci_prop_set_rfreg_cmd { @@ -25,23 +22,6 @@ struct nci_prop_set_rfreg_rsp { __u8 status; }; -#define NCI_PROP_GET_RFREG_VER 0x24 - -struct nci_prop_get_rfreg_ver_rsp { - __u8 status; - __u8 data[8]; -}; - -#define NCI_PROP_SET_RFREG_VER 0x25 - -struct nci_prop_set_rfreg_ver_cmd { - __u8 data[8]; -}; - -struct nci_prop_set_rfreg_ver_rsp { - __u8 status; -}; - #define NCI_PROP_START_RFREG 0x26 struct nci_prop_start_rfreg_rsp { @@ -70,8 +50,6 @@ struct nci_prop_fw_cfg_rsp { __u8 status; }; -#define NCI_PROP_WR_RESET 0x2f - void s3fwrn5_nci_get_prop_ops(struct nci_driver_ops **ops, size_t *n); int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name);