diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-16 09:55:48 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-04 15:34:30 -0400 |
commit | be9ae4ce4ee66e211815122ab4f41913efed4fec (patch) | |
tree | 157edfc0f57ab39fe14e1b7f994378da5a91b649 /drivers/nfc | |
parent | f212ad5e993e7efb996fc8ce94a5de8f0bd06d41 (diff) |
NFC: Introduce target mode tx ops
And rename the initiator mode data exchange ops for consistency sake.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc')
-rw-r--r-- | drivers/nfc/pn533.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c index c6b9bc5ac6e6..fd94c6f5d6a8 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c | |||
@@ -1691,9 +1691,9 @@ error: | |||
1691 | return 0; | 1691 | return 0; |
1692 | } | 1692 | } |
1693 | 1693 | ||
1694 | static int pn533_data_exchange(struct nfc_dev *nfc_dev, | 1694 | static int pn533_transceive(struct nfc_dev *nfc_dev, |
1695 | struct nfc_target *target, struct sk_buff *skb, | 1695 | struct nfc_target *target, struct sk_buff *skb, |
1696 | data_exchange_cb_t cb, void *cb_context) | 1696 | data_exchange_cb_t cb, void *cb_context) |
1697 | { | 1697 | { |
1698 | struct pn533 *dev = nfc_get_drvdata(nfc_dev); | 1698 | struct pn533 *dev = nfc_get_drvdata(nfc_dev); |
1699 | struct pn533_frame *out_frame, *in_frame; | 1699 | struct pn533_frame *out_frame, *in_frame; |
@@ -1853,7 +1853,7 @@ struct nfc_ops pn533_nfc_ops = { | |||
1853 | .stop_poll = pn533_stop_poll, | 1853 | .stop_poll = pn533_stop_poll, |
1854 | .activate_target = pn533_activate_target, | 1854 | .activate_target = pn533_activate_target, |
1855 | .deactivate_target = pn533_deactivate_target, | 1855 | .deactivate_target = pn533_deactivate_target, |
1856 | .data_exchange = pn533_data_exchange, | 1856 | .im_transceive = pn533_transceive, |
1857 | }; | 1857 | }; |
1858 | 1858 | ||
1859 | static int pn533_probe(struct usb_interface *interface, | 1859 | static int pn533_probe(struct usb_interface *interface, |