Commit 8d25ca79 authored by Waldemar Rymarkiewicz's avatar Waldemar Rymarkiewicz Committed by Samuel Ortiz

NFC: pn533: Remove in/out_maxlen as it is not used

in_maxlen and out_maxlen was replaced with PN533_NORMAL_FRAME_MAX_LEN
Signed-off-by: default avatarWaldemar Rymarkiewicz <waldemar.rymarkiewicz@tieto.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 2c2d45bd
...@@ -349,11 +349,9 @@ struct pn533 { ...@@ -349,11 +349,9 @@ struct pn533 {
struct nfc_dev *nfc_dev; struct nfc_dev *nfc_dev;
struct urb *out_urb; struct urb *out_urb;
int out_maxlen;
struct pn533_frame *out_frame; struct pn533_frame *out_frame;
struct urb *in_urb; struct urb *in_urb;
int in_maxlen;
struct pn533_frame *in_frame; struct pn533_frame *in_frame;
struct sk_buff_head resp_q; struct sk_buff_head resp_q;
...@@ -1454,7 +1452,8 @@ static int pn533_send_poll_frame(struct pn533 *dev) ...@@ -1454,7 +1452,8 @@ static int pn533_send_poll_frame(struct pn533 *dev)
pn533_build_poll_frame(dev, dev->out_frame, cur_mod); pn533_build_poll_frame(dev, dev->out_frame, cur_mod);
rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen, pn533_poll_complete, PN533_NORMAL_FRAME_MAX_LEN,
pn533_poll_complete,
NULL, GFP_KERNEL); NULL, GFP_KERNEL);
if (rc) if (rc)
nfc_dev_err(&dev->interface->dev, "Polling loop error %d", rc); nfc_dev_err(&dev->interface->dev, "Polling loop error %d", rc);
...@@ -1567,7 +1566,7 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev) ...@@ -1567,7 +1566,7 @@ static int pn533_activate_target_nfcdep(struct pn533 *dev)
pn533_tx_frame_finish(dev->out_frame); pn533_tx_frame_finish(dev->out_frame);
rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen); PN533_NORMAL_FRAME_MAX_LEN);
if (rc) if (rc)
return rc; return rc;
...@@ -1661,7 +1660,7 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev, ...@@ -1661,7 +1660,7 @@ static void pn533_deactivate_target(struct nfc_dev *nfc_dev,
pn533_tx_frame_finish(dev->out_frame); pn533_tx_frame_finish(dev->out_frame);
rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen); PN533_NORMAL_FRAME_MAX_LEN);
if (rc) { if (rc) {
nfc_dev_err(&dev->interface->dev, "Error when sending release" nfc_dev_err(&dev->interface->dev, "Error when sending release"
" command to the controller"); " command to the controller");
...@@ -1822,8 +1821,9 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target, ...@@ -1822,8 +1821,9 @@ static int pn533_dep_link_up(struct nfc_dev *nfc_dev, struct nfc_target *target,
pn533_tx_frame_finish(dev->out_frame); pn533_tx_frame_finish(dev->out_frame);
rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_async(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen, pn533_in_dep_link_up_complete, PN533_NORMAL_FRAME_MAX_LEN,
cmd, GFP_KERNEL); pn533_in_dep_link_up_complete, cmd,
GFP_KERNEL);
if (rc < 0) if (rc < 0)
kfree(cmd); kfree(cmd);
...@@ -2121,8 +2121,9 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb) ...@@ -2121,8 +2121,9 @@ static int pn533_tm_send(struct nfc_dev *nfc_dev, struct sk_buff *skb)
out_frame = (struct pn533_frame *) skb->data; out_frame = (struct pn533_frame *) skb->data;
rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame, rc = pn533_send_cmd_frame_async(dev, out_frame, dev->in_frame,
dev->in_maxlen, pn533_tm_send_complete, PN533_NORMAL_FRAME_MAX_LEN,
skb, GFP_KERNEL); pn533_tm_send_complete, skb,
GFP_KERNEL);
if (rc) { if (rc) {
nfc_dev_err(&dev->interface->dev, nfc_dev_err(&dev->interface->dev,
"Error %d when trying to send data", rc); "Error %d when trying to send data", rc);
...@@ -2217,7 +2218,7 @@ static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata, ...@@ -2217,7 +2218,7 @@ static int pn533_set_configuration(struct pn533 *dev, u8 cfgitem, u8 *cfgdata,
pn533_tx_frame_finish(dev->out_frame); pn533_tx_frame_finish(dev->out_frame);
rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen); PN533_NORMAL_FRAME_MAX_LEN);
return rc; return rc;
} }
...@@ -2238,7 +2239,7 @@ static int pn533_fw_reset(struct pn533 *dev) ...@@ -2238,7 +2239,7 @@ static int pn533_fw_reset(struct pn533 *dev)
pn533_tx_frame_finish(dev->out_frame); pn533_tx_frame_finish(dev->out_frame);
rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen); PN533_NORMAL_FRAME_MAX_LEN);
return rc; return rc;
} }
...@@ -2359,17 +2360,12 @@ static int pn533_probe(struct usb_interface *interface, ...@@ -2359,17 +2360,12 @@ static int pn533_probe(struct usb_interface *interface,
for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
endpoint = &iface_desc->endpoint[i].desc; endpoint = &iface_desc->endpoint[i].desc;
if (!in_endpoint && usb_endpoint_is_bulk_in(endpoint)) { if (!in_endpoint && usb_endpoint_is_bulk_in(endpoint))
dev->in_maxlen = le16_to_cpu(endpoint->wMaxPacketSize);
in_endpoint = endpoint->bEndpointAddress; in_endpoint = endpoint->bEndpointAddress;
}
if (!out_endpoint && usb_endpoint_is_bulk_out(endpoint)) { if (!out_endpoint && usb_endpoint_is_bulk_out(endpoint))
dev->out_maxlen =
le16_to_cpu(endpoint->wMaxPacketSize);
out_endpoint = endpoint->bEndpointAddress; out_endpoint = endpoint->bEndpointAddress;
} }
}
if (!in_endpoint || !out_endpoint) { if (!in_endpoint || !out_endpoint) {
nfc_dev_err(&interface->dev, "Could not find bulk-in or" nfc_dev_err(&interface->dev, "Could not find bulk-in or"
...@@ -2418,7 +2414,7 @@ static int pn533_probe(struct usb_interface *interface, ...@@ -2418,7 +2414,7 @@ static int pn533_probe(struct usb_interface *interface,
pn533_tx_frame_finish(dev->out_frame); pn533_tx_frame_finish(dev->out_frame);
rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame, rc = pn533_send_cmd_frame_sync(dev, dev->out_frame, dev->in_frame,
dev->in_maxlen); PN533_NORMAL_FRAME_MAX_LEN);
if (rc) if (rc)
goto destroy_wq; goto destroy_wq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment