diff options
| author | Samuel Ortiz <sameo@linux.intel.com> | 2012-05-16 15:55:48 +0200 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-06-04 21:34:30 +0200 |
| commit | be9ae4ce4ee66e211815122ab4f41913efed4fec (patch) | |
| tree | 157edfc0f57ab39fe14e1b7f994378da5a91b649 /drivers/nfc | |
| parent | f212ad5e993e7efb996fc8ce94a5de8f0bd06d41 (diff) | |
| download | linux-3.10-be9ae4ce4ee66e211815122ab4f41913efed4fec.tar.gz linux-3.10-be9ae4ce4ee66e211815122ab4f41913efed4fec.tar.bz2 linux-3.10-be9ae4ce4ee66e211815122ab4f41913efed4fec.zip | |
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 c6b9bc5ac6e..fd94c6f5d6a 100644 --- a/drivers/nfc/pn533.c +++ b/drivers/nfc/pn533.c @@ -1691,9 +1691,9 @@ error: return 0; } -static int pn533_data_exchange(struct nfc_dev *nfc_dev, - struct nfc_target *target, struct sk_buff *skb, - data_exchange_cb_t cb, void *cb_context) +static int pn533_transceive(struct nfc_dev *nfc_dev, + struct nfc_target *target, struct sk_buff *skb, + data_exchange_cb_t cb, void *cb_context) { struct pn533 *dev = nfc_get_drvdata(nfc_dev); struct pn533_frame *out_frame, *in_frame; @@ -1853,7 +1853,7 @@ struct nfc_ops pn533_nfc_ops = { .stop_poll = pn533_stop_poll, .activate_target = pn533_activate_target, .deactivate_target = pn533_deactivate_target, - .data_exchange = pn533_data_exchange, + .im_transceive = pn533_transceive, }; static int pn533_probe(struct usb_interface *interface, |