summaryrefslogtreecommitdiff
path: root/net/nfc
diff options
context:
space:
mode:
authorRobert Dolca <robert.dolca@intel.com>2015-10-22 12:11:39 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-25 22:28:59 +0300
commit22e4bd09c401905671f3787a8392d269a0ebfa0d (patch)
tree017209d05d64f6c910fa78afe601ab34a461126f /net/nfc
parent0a97a3cba298fd989802bf34541c94b6488c3834 (diff)
downloadlinux-22e4bd09c401905671f3787a8392d269a0ebfa0d.tar.xz
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>
Diffstat (limited to 'net/nfc')
-rw-r--r--net/nfc/nci/core.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 30c270862884..f66a5da85ddb 100644
--- 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)