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

media: 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: Sean Young <sean@mess.org>
CC: Mauro Carvalho Chehab <mchehab@kernel.org>
CC: Benjamin Valentin <benpicco@googlemail.com>
Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20220317035514.6378-5-mailhol.vincent@wanadoo.fr


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

drivers/media/rc/ati_remote.c

+2 −2
Original line number Diff line number Diff line
@@ -773,7 +773,7 @@ static int ati_remote_initialize(struct ati_remote *ati_remote) 


	/* Set up irq_urb */

	pipe = usb_rcvintpipe(udev, ati_remote->endpoint_in->bEndpointAddress);

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

	maxp = usb_maxpacket(udev, pipe);

	maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;



	usb_fill_int_urb(ati_remote->irq_urb, udev, pipe, ati_remote->inbuf,
@@ -784,7 +784,7 @@ static int ati_remote_initialize(struct ati_remote *ati_remote) 


	/* Set up out_urb */

	pipe = usb_sndintpipe(udev, ati_remote->endpoint_out->bEndpointAddress);

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

	maxp = usb_maxpacket(udev, pipe);

	maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;



	usb_fill_int_urb(ati_remote->out_urb, udev, pipe, ati_remote->outbuf,

drivers/media/rc/mceusb.c

+1 −1
Original line number Diff line number Diff line
@@ -1728,7 +1728,7 @@ static int mceusb_dev_probe(struct usb_interface *intf, 
		pipe = usb_rcvintpipe(dev, ep_in->bEndpointAddress);

	else

		pipe = usb_rcvbulkpipe(dev, ep_in->bEndpointAddress);

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

	maxp = usb_maxpacket(dev, pipe);



	ir = kzalloc(sizeof(struct mceusb_dev), GFP_KERNEL);

	if (!ir)

drivers/media/rc/streamzap.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int streamzap_probe(struct usb_interface *intf, 
	}



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

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

	maxp = usb_maxpacket(usbdev, pipe);



	if (maxp == 0) {

		dev_err(&intf->dev, "%s: endpoint Max Packet Size is 0!?!\n",

drivers/media/rc/xbox_remote.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int xbox_remote_initialize(struct xbox_remote *xbox_remote, 


	/* Set up irq_urb */

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

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

	maxp = usb_maxpacket(udev, pipe);

	maxp = (maxp > DATA_BUFSIZE) ? DATA_BUFSIZE : maxp;



	usb_fill_int_urb(xbox_remote->irq_urb, udev, pipe, xbox_remote->inbuf,

drivers/media/usb/tm6000/tm6000-dvb.c

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static int tm6000_start_stream(struct tm6000_core *dev) 
	pipe = usb_rcvbulkpipe(dev->udev, dev->bulk_in.endp->desc.bEndpointAddress

							  & USB_ENDPOINT_NUMBER_MASK);



	size = usb_maxpacket(dev->udev, pipe, usb_pipeout(pipe));

	size = usb_maxpacket(dev->udev, pipe);

	size = size * 15; /* 512 x 8 or 12 or 15 */



	dvb->bulk_urb->transfer_buffer = kzalloc(size, GFP_KERNEL);