NFC: nci: rename nci_prop_ops to nci_driver_ops

Initially it was used to create hooks in the driver for
proprietary operations. Currently it is being used for hooks
for both proprietary and generic operations.

Signed-off-by: Robert Dolca <robert.dolca@intel.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/nfc/s3fwrn5/nci.c b/drivers/nfc/s3fwrn5/nci.c
index ace0071c533995a51ac84b79f8f4e7af08ad0acc..075e4e877b3316ee3e9f9c45c73c8c1cb355ed9f 100644 (file)
--- a/drivers/nfc/s3fwrn5/nci.c
+++ b/drivers/nfc/s3fwrn5/nci.c
@@ -31,7 +31,7 @@ static int s3fwrn5_nci_prop_rsp(struct nci_dev *ndev, struct sk_buff *skb)
        return 0;
 }
 
-static struct nci_prop_ops s3fwrn5_nci_prop_ops[] = {
+static struct nci_driver_ops s3fwrn5_nci_prop_ops[] = {
        {
                .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY,
                                NCI_PROP_AGAIN),
@@ -79,7 +79,7 @@ static struct nci_prop_ops s3fwrn5_nci_prop_ops[] = {
        },
 };
 
-void s3fwrn5_nci_get_prop_ops(struct nci_prop_ops **ops, size_t *n)
+void s3fwrn5_nci_get_prop_ops(struct nci_driver_ops **ops, size_t *n)
 {
        *ops = s3fwrn5_nci_prop_ops;
        *n = ARRAY_SIZE(s3fwrn5_nci_prop_ops);

diff --git a/drivers/nfc/s3fwrn5/nci.h b/drivers/nfc/s3fwrn5/nci.h
index 0e68d439dde62344f149039604cddaabad50a35a..60c7fb575b66ca6ea00489f9cf2370d7b5d9401b 100644 (file)
--- a/drivers/nfc/s3fwrn5/nci.h
+++ b/drivers/nfc/s3fwrn5/nci.h
@@ -83,7 +83,7 @@ struct nci_prop_fw_cfg_rsp {
 
 #define NCI_PROP_WR_RESET      0x2f
 
-void s3fwrn5_nci_get_prop_ops(struct nci_prop_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);
 
 #endif /* __LOCAL_S3FWRN5_NCI_H_ */

diff --git a/drivers/nfc/st-nci/core.c b/drivers/nfc/st-nci/core.c
index 8d1fdd2ee4980504a25ceed10bc41cc021853cb4..5443caa0d55e22be4b5e99686402299dd9d32ffb 100644 (file)
--- a/drivers/nfc/st-nci/core.c
+++ b/drivers/nfc/st-nci/core.c
@@ -98,7 +98,7 @@ static int st_nci_prop_rsp_packet(struct nci_dev *ndev,
        return 0;
 }
 
-static struct nci_prop_ops st_nci_prop_ops[] = {
+static struct nci_driver_ops st_nci_prop_ops[] = {
        {
                .opcode = nci_opcode_pack(NCI_GID_PROPRIETARY,
                                          ST_NCI_CORE_PROP),

diff --git a/include/net/nfc/nci_core.h b/include/net/nfc/nci_core.h
index d5a1caae9fd980585a00592ed2c5fc7ee24bc195..5daf0042261ede7d0d9da0cf2909deb3634fa1c0 100644 (file)
--- a/include/net/nfc/nci_core.h
+++ b/include/net/nfc/nci_core.h
@@ -67,7 +67,7 @@ enum nci_state {
 
 struct nci_dev;
 
-struct nci_prop_ops {
+struct nci_driver_ops {
        __u16 opcode;
        int (*rsp)(struct nci_dev *dev, struct sk_buff *skb);
        int (*ntf)(struct nci_dev *dev, struct sk_buff *skb);
@@ -94,10 +94,10 @@ struct nci_ops {
        void  (*hci_cmd_received)(struct nci_dev *ndev, u8 pipe, u8 cmd,
                                  struct sk_buff *skb);
 
-       struct nci_prop_ops *prop_ops;
+       struct nci_driver_ops *prop_ops;
        size_t n_prop_ops;
 
-       struct nci_prop_ops *core_ops;
+       struct nci_driver_ops *core_ops;
        size_t n_core_ops;
 };
 

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 30c270862884e54421d1ce9fd89c2f3b16528f2f..f66a5da85ddbabddb15abaa7a6dbcb79baa7f8f0 100644 (file)
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -1242,12 +1242,12 @@ int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload)
 }
 
 /* Proprietary commands API */
-static struct nci_prop_ops *ops_cmd_lookup(struct nci_prop_ops *ops,
-                                          size_t n_ops,
-                                          __u16 opcode)
+static struct nci_driver_ops *ops_cmd_lookup(struct nci_driver_ops *ops,
+                                            size_t n_ops,
+                                            __u16 opcode)
 {
        size_t i;
-       struct nci_prop_ops *op;
+       struct nci_driver_ops *op;
 
        if (!ops || !n_ops)
                return NULL;
@@ -1262,10 +1262,10 @@ static struct nci_prop_ops *ops_cmd_lookup(struct nci_prop_ops *ops,
 }
 
 static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode,
-                            struct sk_buff *skb, struct nci_prop_ops *ops,
+                            struct sk_buff *skb, struct nci_driver_ops *ops,
                             size_t n_ops)
 {
-       struct nci_prop_ops *op;
+       struct nci_driver_ops *op;
 
        op = ops_cmd_lookup(ops, n_ops, rsp_opcode);
        if (!op || !op->rsp)
@@ -1275,10 +1275,10 @@ static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode,
 }
 
 static int nci_op_ntf_packet(struct nci_dev *ndev, __u16 ntf_opcode,
-                            struct sk_buff *skb, struct nci_prop_ops *ops,
+                            struct sk_buff *skb, struct nci_driver_ops *ops,
                             size_t n_ops)
 {
-       struct nci_prop_ops *op;
+       struct nci_driver_ops *op;
 
        op = ops_cmd_lookup(ops, n_ops, ntf_opcode);
        if (!op || !op->ntf)