Skip to contentSkip to conversation

usb: host: Use helper function to get endpoint

PATCH In review Khalid Masum 2 participants 6 messages Aug 24, 2022 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 usb: host: Use helper function to get endpoint

Current implementation to convert urb pipe number to struct usb_host_endpoint in rquest_single_step_set_feature_urb is a little messy.

Use usb_pipe_endpoint helper function to get the endpoint instead.

---
 drivers/usb/core/hcd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/core/hcd.c +1 -2
index 94b305bbd621..107e29d5d3ae 100644
@@ -2165,8 +2165,7 @@ static struct urb *request_single_step_set_feature_urb(
 		return NULL;
 
 	urb->pipe = usb_rcvctrlpipe(udev, 0);
-	ep = (usb_pipein(urb->pipe) ? udev->ep_in : udev->ep_out)
-				[usb_pipeendpoint(urb->pipe)];
+	ep = usb_pipe_endpoint(udev, urb->pipe);
 	if (!ep) {
 		usb_free_urb(urb);
 		return NULL;
Signature · 1 line
2.37.1
#1 lore raw
Quoted 16 lines · Khalid Masum

Current implementation to convert urb pipe number to struct usb_host_endpoint in rquest_single_step_set_feature_urb is a little messy.

Use usb_pipe_endpoint helper function to get the endpoint instead.

---
 drivers/usb/core/hcd.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/usb/core/hcd.c +0 -0
index 94b305bbd621..107e29d5d3ae 100644

drivers/usb/core/hcd.c static struct urb *request_single_step_set_feature_urb( · line 2171

Quoted 9 lines
drivers/usb/core/hcd.c +1 -2
@@ -2165,8 +2165,7 @@ static struct urb *request_single_step_set_feature_urb(
 		return NULL;
 
 	urb->pipe = usb_rcvctrlpipe(udev, 0);
-	ep = (usb_pipein(urb->pipe) ? udev->ep_in : udev->ep_out)
-				[usb_pipeendpoint(urb->pipe)];
+	ep = usb_pipe_endpoint(udev, urb->pipe);
 	if (!ep) {
 		usb_free_urb(urb);
 		return NULL;

Even this is awkward. It's silly to look up the endpoint in a table when you already know that it is endpoint 0. Just do:

	ep = &udev->ep0;

with no need to check for NULL.

Alan Stern

#2 lore raw
Quoted 6 lines · Alan Stern

On Wed, Aug 24, 2022 at 07:07:02PM +0600, Khalid Masum wrote:

        ep = &udev->ep0;

with no need to check for NULL.

Thanks, I shall send a v2 with this change.

Quoted 1 line

Alan Stern

-- Khalid Masum

#3 lore raw
In reply to Alan Stern
Quoted 8 lines · Alan Stern

Even this is awkward. It's silly to look up the endpoint in a table when you already know that it is endpoint 0. Just do:

        ep = &udev->ep0;

with no need to check for NULL.

After further checking, I realized that usb_device udev is created by ehset_single_step_set_feature and depends on usb_hcd and port. So I do not get why the endpoint is at udev->ep0. Can you help me with this?

-- Khalid Masum
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#4 lore raw
Quoted 6 lines · Khalid Masum
Quoted 5 lines · Alan Stern

Even this is awkward. It's silly to look up the endpoint in a table when you already know that it is endpoint 0. Just do:

Quoted 7 lines
Quoted 3 lines
        ep = &udev->ep0;

with no need to check for NULL.

After further checking, I realized that usb_device udev is created by ehset_single_step_set_feature and depends on usb_hcd and port. So I do not get why the endpoint is at udev->ep0. Can you help me with this?

udev is not a usb_device structure; it is a _pointer_ to a usb_device structure. The pointer is created when ehset_single_step_set_feature() calls usb_hub_find_child(), but the structure itself gets created long before that, when the USB device is first detected and initialized.

You can see this happening where hub_port_connect() calls usb_alloc_dev(). The ep0 field is filled in by hub_port_init() and the routines it calls.

Alan Stern
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees

#5 lore raw
Quoted 10 lines · Alan Stern

udev is not a usb_device structure; it is a _pointer_ to a usb_device structure. The pointer is created when ehset_single_step_set_feature() calls usb_hub_find_child(), but the structure itself gets created long before that, when the USB device is first detected and initialized.

You can see this happening where hub_port_connect() calls usb_alloc_dev(). The ep0 field is filled in by hub_port_init() and the routines it calls.

Thanks for clarifying this. That helps a lot.

-- Khalid Masum