Commit 5277d1ca authored by Jakub Kicinski's avatar Jakub Kicinski

Merge branch 'nfc-s3fwrn5-refactor-the-s3fwrn5-module'

Bongsu Jeon says:

====================
nfc: s3fwrn5: Refactor the s3fwrn5 module

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.
====================

Link: https://lore.kernel.org/r/20201215065401.3220-1-bongsu.jeon@samsung.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 767143a1 e2138e3f
...@@ -21,31 +21,11 @@ static int s3fwrn5_nci_prop_rsp(struct nci_dev *ndev, struct sk_buff *skb) ...@@ -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[] = { 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, .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY,
NCI_PROP_SET_RFREG), NCI_PROP_SET_RFREG),
.rsp = s3fwrn5_nci_prop_rsp, .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, .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY,
NCI_PROP_START_RFREG), NCI_PROP_START_RFREG),
...@@ -61,11 +41,6 @@ static struct nci_driver_ops s3fwrn5_nci_prop_ops[] = { ...@@ -61,11 +41,6 @@ static struct nci_driver_ops s3fwrn5_nci_prop_ops[] = {
NCI_PROP_FW_CFG), NCI_PROP_FW_CFG),
.rsp = s3fwrn5_nci_prop_rsp, .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) void s3fwrn5_nci_get_prop_ops(struct nci_driver_ops **ops, size_t *n)
......
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
#include "s3fwrn5.h" #include "s3fwrn5.h"
#define NCI_PROP_AGAIN 0x01
#define NCI_PROP_GET_RFREG 0x21
#define NCI_PROP_SET_RFREG 0x22 #define NCI_PROP_SET_RFREG 0x22
struct nci_prop_set_rfreg_cmd { struct nci_prop_set_rfreg_cmd {
...@@ -25,23 +22,6 @@ struct nci_prop_set_rfreg_rsp { ...@@ -25,23 +22,6 @@ struct nci_prop_set_rfreg_rsp {
__u8 status; __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 #define NCI_PROP_START_RFREG 0x26
struct nci_prop_start_rfreg_rsp { struct nci_prop_start_rfreg_rsp {
...@@ -70,8 +50,6 @@ struct nci_prop_fw_cfg_rsp { ...@@ -70,8 +50,6 @@ struct nci_prop_fw_cfg_rsp {
__u8 status; __u8 status;
}; };
#define NCI_PROP_WR_RESET 0x2f
void s3fwrn5_nci_get_prop_ops(struct nci_driver_ops **ops, size_t *n); 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); int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name);
......
...@@ -20,7 +20,8 @@ void s3fwrn5_phy_set_wake(void *phy_id, bool wake) ...@@ -20,7 +20,8 @@ void s3fwrn5_phy_set_wake(void *phy_id, bool wake)
mutex_lock(&phy->mutex); mutex_lock(&phy->mutex);
gpio_set_value(phy->gpio_fw_wake, wake); gpio_set_value(phy->gpio_fw_wake, wake);
msleep(S3FWRN5_EN_WAIT_TIME); if (wake)
msleep(S3FWRN5_EN_WAIT_TIME);
mutex_unlock(&phy->mutex); mutex_unlock(&phy->mutex);
} }
EXPORT_SYMBOL(s3fwrn5_phy_set_wake); EXPORT_SYMBOL(s3fwrn5_phy_set_wake);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment