mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-16 07:51:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

nfc: pn533: refactor endpoint lookup

Browse Source 
Use the common USB helpers for looking up bulk and interrupt endpoints
(and determining endpoint numbers) instead of open coding.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260330103655.1672331-3-johan@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Johan Hovold
2026-03-30 12:36:54 +02:00
committed by Jakub Kicinski
parent dba69cba4a
commit 13f2e141b9
1 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/nfc/pn533/usb.c
View File

@@ -476,14 +476,9 @@ static const struct pn533_phy_ops usb_phy_ops = {
static int pn533_usb_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
struct usb_endpoint_descriptor *ep_in, *ep_out;
struct pn533 *priv;
struct pn533_usb_phy *phy;
struct usb_host_interface *iface_desc;
struct usb_endpoint_descriptor *endpoint;
int in_endpoint = 0;
int out_endpoint = 0;
int rc = -ENOMEM;
int i;
u32 protocols;
enum pn533_protocol_type protocol_type = PN533_PROTO_REQ_ACK_RESP;
struct pn533_frame_ops *fops = NULL;
@@ -491,6 +486,7 @@ static int pn533_usb_probe(struct usb_interface *interface,
int in_buf_len = PN533_EXT_FRAME_HEADER_LEN +
PN533_STD_FRAME_MAX_PAYLOAD_LEN +
PN533_STD_FRAME_TAIL_LEN;
int rc;
phy = devm_kzalloc(&interface->dev, sizeof(*phy), GFP_KERNEL);
if (!phy)
@@ -503,21 +499,11 @@ static int pn533_usb_probe(struct usb_interface *interface,
phy->udev = interface_to_usbdev(interface);
phy->interface = interface;
iface_desc = interface->cur_altsetting;
for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
endpoint = &iface_desc->endpoint[i].desc;
if (!in_endpoint && usb_endpoint_is_bulk_in(endpoint))
in_endpoint = endpoint->bEndpointAddress;
if (!out_endpoint && usb_endpoint_is_bulk_out(endpoint))
out_endpoint = endpoint->bEndpointAddress;
}
if (!in_endpoint || !out_endpoint) {
rc = usb_find_common_endpoints(interface->cur_altsetting, &ep_in,
&ep_out, NULL, NULL);
if (rc) {
nfc_err(&interface->dev,
"Could not find bulk-in or bulk-out endpoint\n");
rc = -ENODEV;
goto error;
}
@@ -525,18 +511,20 @@ static int pn533_usb_probe(struct usb_interface *interface,
phy->out_urb = usb_alloc_urb(0, GFP_KERNEL);
phy->ack_urb = usb_alloc_urb(0, GFP_KERNEL);
if (!phy->in_urb || !phy->out_urb || !phy->ack_urb)
if (!phy->in_urb || !phy->out_urb || !phy->ack_urb) {
rc = -ENOMEM;
goto error;
}
usb_fill_bulk_urb(phy->in_urb, phy->udev,
usb_rcvbulkpipe(phy->udev, in_endpoint),
usb_rcvbulkpipe(phy->udev, usb_endpoint_num(ep_in)),
in_buf, in_buf_len, NULL, phy);
usb_fill_bulk_urb(phy->out_urb, phy->udev,
usb_sndbulkpipe(phy->udev, out_endpoint),
usb_sndbulkpipe(phy->udev, usb_endpoint_num(ep_out)),
NULL, 0, pn533_out_complete, phy);
usb_fill_bulk_urb(phy->ack_urb, phy->udev,
usb_sndbulkpipe(phy->udev, out_endpoint),
usb_sndbulkpipe(phy->udev, usb_endpoint_num(ep_out)),
NULL, 0, pn533_ack_complete, phy);
switch (id->driver_info) {