2020-12-15 06:58:21

by Bongsu Jeon

Subject: [PATCH v2 net-next 0/2] nfc: s3fwrn5: Refactor the s3fwrn5 module

From: Bongsu Jeon <[email protected]>

Refactor the s3fwrn5 module.

1/2 is to remove the unneeded delay for NFC sleep.
2/2 is to remove the unused NCI prop commands.

ChangeLog:
v2:
- Update the commit messages.

Bongsu Jeon (2):
nfc: s3fwrn5: Remove the delay for NFC sleep
nfc: s3fwrn5: Remove unused NCI prop commands

drivers/nfc/s3fwrn5/nci.c | 25 -------------------------
drivers/nfc/s3fwrn5/nci.h | 22 ----------------------
drivers/nfc/s3fwrn5/phy_common.c | 3 ++-
3 files changed, 2 insertions(+), 48 deletions(-)

--
2.17.1

2020-12-15 06:58:26

by Bongsu Jeon

Subject: [PATCH v2 net-next 1/2] nfc: s3fwrn5: Remove the delay for NFC sleep

From: Bongsu Jeon <[email protected]>

Remove the delay for NFC sleep because the delay is only needed to
guarantee that the NFC is awake.

Signed-off-by: Bongsu Jeon <[email protected]>
---
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);
--
2.17.1

2020-12-15 07:00:36

by Bongsu Jeon

Subject: [PATCH v2 net-next 2/2] nfc: s3fwrn5: Remove unused NCI prop commands

From: Bongsu Jeon <[email protected]>

Remove the unused NCI prop commands that s3fwrn5 driver doesn't use.

Signed-off-by: Bongsu Jeon <[email protected]>
---
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);

--
2.17.1

2020-12-15 09:17:20

by Krzysztof Kozlowski

Subject: Re: [PATCH v2 net-next 2/2] nfc: s3fwrn5: Remove unused NCI prop commands

On Tue, Dec 15, 2020 at 03:54:01PM +0900, Bongsu Jeon wrote:
> From: Bongsu Jeon <[email protected]>
>
> Remove the unused NCI prop commands that s3fwrn5 driver doesn't use.
>
> Signed-off-by: Bongsu Jeon <[email protected]>
> ---
> drivers/nfc/s3fwrn5/nci.c | 25 -------------------------
> drivers/nfc/s3fwrn5/nci.h | 22 ----------------------
> 2 files changed, 47 deletions(-)
>

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof

2020-12-15 09:18:51

by Krzysztof Kozlowski

Subject: Re: [PATCH v2 net-next 1/2] nfc: s3fwrn5: Remove the delay for NFC sleep

On Tue, Dec 15, 2020 at 03:54:00PM +0900, Bongsu Jeon wrote:
> From: Bongsu Jeon <[email protected]>
>
> Remove the delay for NFC sleep because the delay is only needed to
> guarantee that the NFC is awake.
>
> Signed-off-by: Bongsu Jeon <[email protected]>
> ---
> drivers/nfc/s3fwrn5/phy_common.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>

Reviewed-by: Krzysztof Kozlowski <[email protected]>

Best regards,
Krzysztof