nfc: s3fwrn5: Remove unused NCI prop commands

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

Signed-off-by: Bongsu Jeon <bongsu.jeon@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c
index 103bf5c..f042d3e 100644 (file)
--- a/drivers/nfc/s3fwrn5/nci.c
+++ b/drivers/nfc/s3fwrn5/nci.c
@@ -23,31 +23,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),
                .rsp = s3fwrn5_nci_prop_rsp,
        },
@@ -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 23c0b28..a80f0fb 100644 (file)
--- 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);