iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: deprecate the third argument of usb_maxpacket()

Browse Source 
This is a transitional patch with the ultimate goal of changing the
prototype of usb_maxpacket() from:
| static inline __u16
| usb_maxpacket(struct usb_device *udev, int pipe, int is_out)

into:
| static inline u16 usb_maxpacket(struct usb_device *udev, int pipe)

The third argument of usb_maxpacket(): is_out gets removed because it
can be derived from its second argument: pipe using
usb_pipeout(pipe). Furthermore, in the current version,
ubs_pipeout(pipe) is called regardless in order to sanitize the is_out
parameter.

In order to make a smooth change, we first deprecate the is_out
parameter by simply ignoring it (using a variadic function) and will
remove it later, once all the callers get updated.

The body of the function is reworked accordingly and is_out is
replaced by usb_pipeout(pipe). The WARN_ON() calls become unnecessary
and get removed.

Finally, the return type is changed from __u16 to u16 because this is
not a UAPI function.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20220317035514.6378-2-mailhol.vincent@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Vincent Mailhol 2022-03-17 12:55:06 +09:00 committed by Greg Kroah-Hartman
parent 63acaa8e9c
commit 0f08c2e745
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/linux/usb.h
View File

@ -1969,21 +1969,17 @@ usb_pipe_endpoint(struct usb_device *dev, unsigned int pipe)
return eps[usb_pipeendpoint(pipe)]; return eps[usb_pipeendpoint(pipe)];
} }
/*-------------------------------------------------------------------------*/ static inline u16 usb_maxpacket(struct usb_device *udev, int pipe,
/* int is_out deprecated */ ...)
static inline __u16
usb_maxpacket(struct usb_device *udev, int pipe, int is_out)
{ {
struct usb_host_endpoint *ep; struct usb_host_endpoint *ep;
unsigned epnum = usb_pipeendpoint(pipe); unsigned epnum = usb_pipeendpoint(pipe);
if (is_out) { if (usb_pipeout(pipe))
WARN_ON(usb_pipein(pipe));
ep = udev->ep_out[epnum]; ep = udev->ep_out[epnum];
} else { else
WARN_ON(usb_pipeout(pipe));
ep = udev->ep_in[epnum]; ep = udev->ep_in[epnum];
}
if (!ep) if (!ep)
return 0; return 0;
@ -1991,8 +1987,6 @@ usb_maxpacket(struct usb_device *udev, int pipe, int is_out)
return usb_endpoint_maxp(&ep->desc); return usb_endpoint_maxp(&ep->desc);
} }
/* ----------------------------------------------------------------------- */
/* translate USB error codes to codes user space understands */ /* translate USB error codes to codes user space understands */
static inline int usb_translate_errors(int error_code) static inline int usb_translate_errors(int error_code)
{ {