diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-03-05 01:03:50 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-03-06 15:16:23 -0500 |
| commit | 47807d3dbb62e93850cbcb797db1a9ee1806f986 (patch) | |
| tree | f8e1970083547290e35830e5bedb4a4ce7237f97 /include/net/nfc | |
| parent | 9dda50f4c98f84e32a5f6dc4d9dd7af6085add43 (diff) | |
| download | linux-3.10-47807d3dbb62e93850cbcb797db1a9ee1806f986.tar.gz linux-3.10-47807d3dbb62e93850cbcb797db1a9ee1806f986.tar.bz2 linux-3.10-47807d3dbb62e93850cbcb797db1a9ee1806f986.zip | |
NFC: Remove the rf mode parameter from the DEP link up routine
When calling nfc_dep_link_up, we implicitely are in initiator mode.
Which means we also can provide the general bytes as a function argument,
as all drivers will eventually request them.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/nfc')
| -rw-r--r-- | include/net/nfc/nfc.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/net/nfc/nfc.h b/include/net/nfc/nfc.h index d253278e5a9..d608e4eac66 100644 --- a/include/net/nfc/nfc.h +++ b/include/net/nfc/nfc.h @@ -53,8 +53,8 @@ struct nfc_ops { int (*dev_down)(struct nfc_dev *dev); int (*start_poll)(struct nfc_dev *dev, u32 protocols); void (*stop_poll)(struct nfc_dev *dev); - int (*dep_link_up)(struct nfc_dev *dev, int target_idx, - u8 comm_mode, u8 rf_mode); + int (*dep_link_up)(struct nfc_dev *dev, int target_idx, u8 comm_mode, + u8 *gb, size_t gb_len); int (*dep_link_down)(struct nfc_dev *dev); int (*activate_target)(struct nfc_dev *dev, u32 target_idx, u32 protocol); @@ -179,8 +179,6 @@ struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp); int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gt, u8 gt_len); -u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, u8 *gt_len); - int nfc_targets_found(struct nfc_dev *dev, struct nfc_target *targets, int ntargets); |