From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org
Cc: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Subject: [PATCH v3 1/9] usb: deprecate the third argument of usb_maxpacket()
Date: Thu, 17 Mar 2022 01:19:27 +0900 [thread overview]
Message-ID: <20220316161935.2049-2-mailhol.vincent@wanadoo.fr> (raw)
In-Reply-To: <20220316161935.2049-1-mailhol.vincent@wanadoo.fr>
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>
---
include/linux/usb.h | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/include/linux/usb.h b/include/linux/usb.h
index 200b7b79acb5..572e136f6314 100644
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
@@ -1969,21 +1969,17 @@ usb_pipe_endpoint(struct usb_device *dev, unsigned int pipe)
return eps[usb_pipeendpoint(pipe)];
}
-/*-------------------------------------------------------------------------*/
-
-static inline __u16
-usb_maxpacket(struct usb_device *udev, int pipe, int is_out)
+static inline u16 usb_maxpacket(struct usb_device *udev, int pipe,
+ /* int is_out deprecated */ ...)
{
struct usb_host_endpoint *ep;
unsigned epnum = usb_pipeendpoint(pipe);
- if (is_out) {
- WARN_ON(usb_pipein(pipe));
+ if (usb_pipeout(pipe))
ep = udev->ep_out[epnum];
- } else {
- WARN_ON(usb_pipeout(pipe));
+ else
ep = udev->ep_in[epnum];
- }
+
if (!ep)
return 0;
@@ -1991,8 +1987,6 @@ usb_maxpacket(struct usb_device *udev, int pipe, int is_out)
return usb_endpoint_maxp(&ep->desc);
}
-/* ----------------------------------------------------------------------- */
-
/* translate USB error codes to codes user space understands */
static inline int usb_translate_errors(int error_code)
{
--
2.34.1
next prev parent reply other threads:[~2022-03-16 16:19 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 10:53 [PATCH] usb: rework usb_maxpacket() and remove its third argument Vincent Mailhol
2022-03-04 14:20 ` Greg Kroah-Hartman
2022-03-04 17:23 ` Vincent MAILHOL
2022-03-04 17:32 ` Greg Kroah-Hartman
2022-03-06 7:55 ` [PATCH v2 00/10] " Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 01/10] usb: oxu210hp-hcd: remove redundant call to max_packet() macro Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 02/10] usb: isp1760: remove redundant " Vincent Mailhol
2022-03-06 19:49 ` Rui Miguel Silva
2022-03-06 7:55 ` [PATCH v2 03/10] usb: rework usb_maxpacket() and deprecate its third argument Vincent Mailhol
2022-03-15 17:25 ` Greg Kroah-Hartman
2022-03-16 1:41 ` Vincent MAILHOL
2022-03-06 7:55 ` [PATCH v2 04/10] HID: usbhid: remove third argument of usb_maxpacket() Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 05/10] Input: " Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 06/10] media: " Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 07/10] net: " Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 08/10] usb: " Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 09/10] sound: " Vincent Mailhol
2022-03-06 7:55 ` [PATCH v2 10/10] " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 0/9] usb: rework usb_maxpacket() and remove its third argument Vincent Mailhol
2022-03-16 16:19 ` Vincent Mailhol [this message]
2022-03-16 16:19 ` [PATCH v3 2/9] HID: usbhid: remove third argument of usb_maxpacket() Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 3/9] Input: " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 4/9] media: " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 5/9] net: " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 6/9] usb: " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 7/9] sound: " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 8/9] " Vincent Mailhol
2022-03-16 16:19 ` [PATCH v3 9/9] usb: rework usb_maxpacket() using usb_pipe_endpoint() Vincent Mailhol
2022-03-16 17:17 ` Alan Stern
2022-03-16 23:26 ` Vincent MAILHOL
2022-03-17 3:55 ` [PATCH v4 0/9] usb: rework usb_maxpacket() and remove its third argument Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 1/9] usb: deprecate the third argument of usb_maxpacket() Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 2/9] HID: usbhid: remove " Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 3/9] Input: " Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 4/9] media: " Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 5/9] net: " Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 6/9] usb: " Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 7/9] sound: " Vincent Mailhol
2022-03-22 13:22 ` Takashi Iwai
2022-03-17 3:55 ` [PATCH v4 8/9] " Vincent Mailhol
2022-03-17 3:55 ` [PATCH v4 9/9] usb: rework usb_maxpacket() using usb_pipe_endpoint() Vincent Mailhol
2022-04-22 13:38 ` [PATCH v4 0/9] usb: rework usb_maxpacket() and remove its third argument Greg Kroah-Hartman
2022-04-22 14:00 ` Vincent MAILHOL
2022-04-22 14:07 ` Vincent MAILHOL
2022-04-22 14:19 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220316161935.2049-2-mailhol.vincent@wanadoo.fr \
--to=mailhol.vincent@wanadoo.fr \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).