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

Input: 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: Ville Syrjala <syrjala@sci.fi>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC: Henk Vergonet <Henk.Vergonet@gmail.com>
Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20220317035514.6378-4-mailhol.vincent@wanadoo.fr


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

drivers/input/misc/ati_remote2.c

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ static int ati_remote2_urb_init(struct ati_remote2 *ar2) 
			return -ENOMEM;



		pipe = usb_rcvintpipe(udev, ar2->ep[i]->bEndpointAddress);

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

		maxp = usb_maxpacket(udev, pipe);

		maxp = maxp > 4 ? 4 : maxp;



		usb_fill_int_urb(ar2->urb[i], udev, pipe, ar2->buf[i], maxp,

drivers/input/misc/cm109.c

+1 −1
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ static int cm109_usb_probe(struct usb_interface *intf, 


	/* get a handle to the interrupt data pipe */

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

	ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));

	ret = usb_maxpacket(udev, pipe);

	if (ret != USB_PKT_LEN)

		dev_err(&intf->dev, "invalid payload size %d, expected %d\n",

			ret, USB_PKT_LEN);

drivers/input/misc/powermate.c

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int powermate_probe(struct usb_interface *intf, const struct usb_device_i 


	/* get a handle to the interrupt data pipe */

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

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

	maxp = usb_maxpacket(udev, pipe);



	if (maxp < POWERMATE_PAYLOAD_SIZE_MIN || maxp > POWERMATE_PAYLOAD_SIZE_MAX) {

		printk(KERN_WARNING "powermate: Expected payload of %d--%d bytes, found %d bytes!\n",

drivers/input/misc/yealink.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static int usb_probe(struct usb_interface *intf, const struct usb_device_id *id) 


	/* get a handle to the interrupt data pipe */

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

	ret = usb_maxpacket(udev, pipe, usb_pipeout(pipe));

	ret = usb_maxpacket(udev, pipe);

	if (ret != USB_PKT_LEN)

		dev_err(&intf->dev, "invalid payload size %d, expected %zd\n",

			ret, USB_PKT_LEN);

drivers/input/tablet/acecad.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static int usb_acecad_probe(struct usb_interface *intf, const struct usb_device_ 
		return -ENODEV;



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

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

	maxp = usb_maxpacket(dev, pipe);



	acecad = kzalloc(sizeof(struct usb_acecad), GFP_KERNEL);

	input_dev = input_allocate_device();