Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe54b058 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Greg Kroah-Hartman
Browse files

USB: Add a usb_pipe_endpoint() convenience function 



Converting a pipe number to a struct usb_host_endpoint pointer is a little
messy.  Introduce a new convenience function to hide the mess.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b18a2349

drivers/usb/core/message.c

+1 −2
Original line number Diff line number Diff line
@@ -226,8 +226,7 @@ int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe, 
	struct urb *urb;

	struct usb_host_endpoint *ep;



	ep = (usb_pipein(pipe) ? usb_dev->ep_in : usb_dev->ep_out)

			[usb_pipeendpoint(pipe)];

	ep = usb_pipe_endpoint(usb_dev, pipe);

	if (!ep || len < 0)

		return -EINVAL;

drivers/usb/core/urb.c

+1 −2
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ int usb_submit_urb(struct urb *urb, gfp_t mem_flags) 
	 * will be required to set urb->ep directly and we will eliminate

	 * urb->pipe.

	 */

	ep = (usb_pipein(urb->pipe) ? dev->ep_in : dev->ep_out)

			[usb_pipeendpoint(urb->pipe)];

	ep = usb_pipe_endpoint(dev, urb->pipe);

	if (!ep)

		return -ENOENT;

include/linux/usb.h

+8 −0
Original line number Diff line number Diff line
@@ -1552,6 +1552,14 @@ static inline unsigned int __create_pipe(struct usb_device *dev, 
#define usb_rcvintpipe(dev,endpoint)	\

	((PIPE_INTERRUPT << 30) | __create_pipe(dev, endpoint) | USB_DIR_IN)



static inline struct usb_host_endpoint *

usb_pipe_endpoint(struct usb_device *dev, unsigned int pipe)

{

	struct usb_host_endpoint **eps;

	eps = usb_pipein(pipe) ? dev->ep_in : dev->ep_out;

	return eps[usb_pipeendpoint(pipe)];

}



/*-------------------------------------------------------------------------*/



static inline __u16