p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Robert Dolca 2015-10-22 12:11:39 +03:00 committed by Samuel Ortiz
parent 0a97a3cba2
commit 22e4bd09c4
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nfc/s3fwrn5/nci.c
View File

@ -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);

2
drivers/nfc/s3fwrn5/nci.h
View File

@ -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_ */

2
drivers/nfc/st-nci/core.c
View File

@ -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),

6
include/net/nfc/nci_core.h
View File

@ -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;
};

16
net/nfc/nci/core.c
View File

@ -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)