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

net: 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: Oliver Neukum <oliver@neukum.org>
CC: David S. Miller <davem@davemloft.net>
CC: Jakub Kicinski <kuba@kernel.org>
CC: Woojung Huh <woojung.huh@microchip.com>
CC: Felix Fietkau <nbd@nbd.name>
CC: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
CC: Ryder Lee <ryder.lee@mediatek.com>
CC: Kalle Valo <kvalo@kernel.org>
CC: Matthias Brugger <matthias.bgg@gmail.com>
CC: Stanislaw Gruszka <stf_xl@wp.pl>
CC: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarVincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20220317035514.6378-6-mailhol.vincent@wanadoo.fr


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

drivers/net/usb/cdc_ncm.c

+2 −2
Original line number Diff line number Diff line
@@ -441,7 +441,7 @@ static void cdc_ncm_update_rxtx_max(struct usbnet *dev, u32 new_rx, u32 new_tx) 
	 * .bind which is called before usbnet sets up dev->maxpacket

	 */

	if (val != le32_to_cpu(ctx->ncm_parm.dwNtbOutMaxSize) &&

	    val % usb_maxpacket(dev->udev, dev->out, 1) == 0)

	    val % usb_maxpacket(dev->udev, dev->out) == 0)

		val++;



	/* we might need to flush any pending tx buffers if running */
@@ -465,7 +465,7 @@ static void cdc_ncm_update_rxtx_max(struct usbnet *dev, u32 new_rx, u32 new_tx) 
	usbnet_update_max_qlen(dev);



	/* never pad more than 3 full USB packets per transfer */

	ctx->min_tx_pkt = clamp_t(u16, ctx->tx_max - 3 * usb_maxpacket(dev->udev, dev->out, 1),

	ctx->min_tx_pkt = clamp_t(u16, ctx->tx_max - 3 * usb_maxpacket(dev->udev, dev->out),

				  CDC_NCM_MIN_TX_PKT, ctx->tx_max);

}

drivers/net/usb/lan78xx.c

+2 −2
Original line number Diff line number Diff line
@@ -4423,7 +4423,7 @@ static int lan78xx_probe(struct usb_interface *intf, 
		goto out4;



	period = ep_intr->desc.bInterval;

	maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0);

	maxp = usb_maxpacket(dev->udev, dev->pipe_intr);

	buf = kmalloc(maxp, GFP_KERNEL);

	if (!buf) {

		ret = -ENOMEM;
@@ -4441,7 +4441,7 @@ static int lan78xx_probe(struct usb_interface *intf, 
		dev->urb_intr->transfer_flags |= URB_FREE_BUFFER;

	}



	dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out, 1);

	dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out);



	/* Reject broken descriptors. */

	if (dev->maxpacket == 0) {

drivers/net/usb/rndis_host.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags) 
	net->hard_header_len += sizeof (struct rndis_data_hdr);

	dev->hard_mtu = net->mtu + net->hard_header_len;



	dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1);

	dev->maxpacket = usb_maxpacket(dev->udev, dev->out);

	if (dev->maxpacket == 0) {

		netif_dbg(dev, probe, dev->net,

			  "dev->maxpacket can't be 0\n");

drivers/net/usb/usbnet.c

+2 −2
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf) 
	pipe = usb_rcvintpipe (dev->udev,

			dev->status->desc.bEndpointAddress

				& USB_ENDPOINT_NUMBER_MASK);

	maxp = usb_maxpacket (dev->udev, pipe, 0);

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



	/* avoid 1 msec chatter:  min 8 msec poll rate */

	period = max ((int) dev->status->desc.bInterval,
@@ -1789,7 +1789,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) 


	if (!dev->rx_urb_size)

		dev->rx_urb_size = dev->hard_mtu;

	dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1);

	dev->maxpacket = usb_maxpacket(dev->udev, dev->out);

	if (dev->maxpacket == 0) {

		/* that is a broken device */

		status = -ENODEV;

drivers/net/wireless/mediatek/mt76/usb.c

+1 −1
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ int __mt76u_init(struct mt76_dev *dev, struct usb_interface *intf, 


	INIT_WORK(&usb->stat_work, mt76u_tx_status_data);



	usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1);

	usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0));

	if (usb->data_len < 32)

		usb->data_len = 32;