diff options
author | Robert Dolca <robert.dolca@intel.com> | 2015-10-22 05:11:39 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2015-10-25 15:28:59 -0400 |
commit | 22e4bd09c401905671f3787a8392d269a0ebfa0d (patch) | |
tree | 017209d05d64f6c910fa78afe601ab34a461126f /net/nfc | |
parent | 0a97a3cba298fd989802bf34541c94b6488c3834 (diff) |
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.c | 16 |
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) | |||
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | /* Proprietary commands API */ | 1244 | /* Proprietary commands API */ |
1245 | static struct nci_prop_ops *ops_cmd_lookup(struct nci_prop_ops *ops, | 1245 | static struct nci_driver_ops *ops_cmd_lookup(struct nci_driver_ops *ops, |
1246 | size_t n_ops, | 1246 | size_t n_ops, |
1247 | __u16 opcode) | 1247 | __u16 opcode) |
1248 | { | 1248 | { |
1249 | size_t i; | 1249 | size_t i; |
1250 | struct nci_prop_ops *op; | 1250 | struct nci_driver_ops *op; |
1251 | 1251 | ||
1252 | if (!ops || !n_ops) | 1252 | if (!ops || !n_ops) |
1253 | return NULL; | 1253 | return NULL; |
@@ -1262,10 +1262,10 @@ static struct nci_prop_ops *ops_cmd_lookup(struct nci_prop_ops *ops, | |||
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode, | 1264 | static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode, |
1265 | struct sk_buff *skb, struct nci_prop_ops *ops, | 1265 | struct sk_buff *skb, struct nci_driver_ops *ops, |
1266 | size_t n_ops) | 1266 | size_t n_ops) |
1267 | { | 1267 | { |
1268 | struct nci_prop_ops *op; | 1268 | struct nci_driver_ops *op; |
1269 | 1269 | ||
1270 | op = ops_cmd_lookup(ops, n_ops, rsp_opcode); | 1270 | op = ops_cmd_lookup(ops, n_ops, rsp_opcode); |
1271 | if (!op || !op->rsp) | 1271 | if (!op || !op->rsp) |
@@ -1275,10 +1275,10 @@ static int nci_op_rsp_packet(struct nci_dev *ndev, __u16 rsp_opcode, | |||
1275 | } | 1275 | } |
1276 | 1276 | ||
1277 | static int nci_op_ntf_packet(struct nci_dev *ndev, __u16 ntf_opcode, | 1277 | static int nci_op_ntf_packet(struct nci_dev *ndev, __u16 ntf_opcode, |
1278 | struct sk_buff *skb, struct nci_prop_ops *ops, | 1278 | struct sk_buff *skb, struct nci_driver_ops *ops, |
1279 | size_t n_ops) | 1279 | size_t n_ops) |
1280 | { | 1280 | { |
1281 | struct nci_prop_ops *op; | 1281 | struct nci_driver_ops *op; |
1282 | 1282 | ||
1283 | op = ops_cmd_lookup(ops, n_ops, ntf_opcode); | 1283 | op = ops_cmd_lookup(ops, n_ops, ntf_opcode); |
1284 | if (!op || !op->ntf) | 1284 | if (!op || !op->ntf) |