Commit b45cde33 authored by Vincent Mailhol's avatar Vincent Mailhol Committed by Greg Kroah-Hartman
Browse files

HID: usbhid: remove third argument of usb_maxpacket() 



The third argument of usb_maxpacket(): in_out has been deprecated
because it could be derived from the second argument (e.g. using
usb_pipeout(pipe)).

N.B. function usb_maxpacket() was made variadic to accommodate the
transition from the old prototype with three arguments to the new one
with only two arguments (so that no renaming is needed). The variadic
argument is to be removed once all users of usb_maxpacket() get
migrated.

CC: Jiri Kosina <jikos@kernel.org>
CC: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20220317035514.6378-3-mailhol.vincent@wanadoo.fr


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0f08c2e7

drivers/hid/usbhid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ static int hid_submit_ctrl(struct hid_device *hid) 


		usbhid->urbctrl->pipe = usb_rcvctrlpipe(hid_to_usb_dev(hid), 0);

		maxpacket = usb_maxpacket(hid_to_usb_dev(hid),

					  usbhid->urbctrl->pipe, 0);

					  usbhid->urbctrl->pipe);

		len += (len == 0);	/* Don't allow 0-length reports */

		len = round_up(len, maxpacket);

		if (len > usbhid->bufsize)

drivers/hid/usbhid/usbkbd.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int usb_kbd_probe(struct usb_interface *iface, 
		return -ENODEV;



	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);

	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));

	maxp = usb_maxpacket(dev, pipe);



	kbd = kzalloc(sizeof(struct usb_kbd), GFP_KERNEL);

	input_dev = input_allocate_device();

drivers/hid/usbhid/usbmouse.c

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i 
		return -ENODEV;



	pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);

	maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));

	maxp = usb_maxpacket(dev, pipe);



	mouse = kzalloc(sizeof(struct usb_mouse), GFP_KERNEL);

	input_dev = input_allocate_device();