Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20220317035514.6378-6-mailhol.vincent@wanadoo.fr
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Vincent Mailhol and committed by
Greg Kroah-Hartman
e13adbfa 61f879ab

+10 -10
+2 -2
drivers/net/usb/cdc_ncm.c
··· 441 441 * .bind which is called before usbnet sets up dev->maxpacket 442 442 */ 443 443 if (val != le32_to_cpu(ctx->ncm_parm.dwNtbOutMaxSize) && 444 - val % usb_maxpacket(dev->udev, dev->out, 1) == 0) 444 + val % usb_maxpacket(dev->udev, dev->out) == 0) 445 445 val++; 446 446 447 447 /* we might need to flush any pending tx buffers if running */ ··· 465 465 usbnet_update_max_qlen(dev); 466 466 467 467 /* never pad more than 3 full USB packets per transfer */ 468 - ctx->min_tx_pkt = clamp_t(u16, ctx->tx_max - 3 * usb_maxpacket(dev->udev, dev->out, 1), 468 + ctx->min_tx_pkt = clamp_t(u16, ctx->tx_max - 3 * usb_maxpacket(dev->udev, dev->out), 469 469 CDC_NCM_MIN_TX_PKT, ctx->tx_max); 470 470 } 471 471
+2 -2
drivers/net/usb/lan78xx.c
··· 4423 4423 goto out4; 4424 4424 4425 4425 period = ep_intr->desc.bInterval; 4426 - maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0); 4426 + maxp = usb_maxpacket(dev->udev, dev->pipe_intr); 4427 4427 buf = kmalloc(maxp, GFP_KERNEL); 4428 4428 if (!buf) { 4429 4429 ret = -ENOMEM; ··· 4441 4441 dev->urb_intr->transfer_flags |= URB_FREE_BUFFER; 4442 4442 } 4443 4443 4444 - dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out, 1); 4444 + dev->maxpacket = usb_maxpacket(dev->udev, dev->pipe_out); 4445 4445 4446 4446 /* Reject broken descriptors. */ 4447 4447 if (dev->maxpacket == 0) {
+1 -1
drivers/net/usb/rndis_host.c
··· 333 333 net->hard_header_len += sizeof (struct rndis_data_hdr); 334 334 dev->hard_mtu = net->mtu + net->hard_header_len; 335 335 336 - dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1); 336 + dev->maxpacket = usb_maxpacket(dev->udev, dev->out); 337 337 if (dev->maxpacket == 0) { 338 338 netif_dbg(dev, probe, dev->net, 339 339 "dev->maxpacket can't be 0\n");
+2 -2
drivers/net/usb/usbnet.c
··· 229 229 pipe = usb_rcvintpipe (dev->udev, 230 230 dev->status->desc.bEndpointAddress 231 231 & USB_ENDPOINT_NUMBER_MASK); 232 - maxp = usb_maxpacket (dev->udev, pipe, 0); 232 + maxp = usb_maxpacket(dev->udev, pipe); 233 233 234 234 /* avoid 1 msec chatter: min 8 msec poll rate */ 235 235 period = max ((int) dev->status->desc.bInterval, ··· 1789 1789 1790 1790 if (!dev->rx_urb_size) 1791 1791 dev->rx_urb_size = dev->hard_mtu; 1792 - dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); 1792 + dev->maxpacket = usb_maxpacket(dev->udev, dev->out); 1793 1793 if (dev->maxpacket == 0) { 1794 1794 /* that is a broken device */ 1795 1795 status = -ENODEV;
+1 -1
drivers/net/wireless/mediatek/mt76/usb.c
··· 1068 1068 1069 1069 INIT_WORK(&usb->stat_work, mt76u_tx_status_data); 1070 1070 1071 - usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1); 1071 + usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0)); 1072 1072 if (usb->data_len < 32) 1073 1073 usb->data_len = 32; 1074 1074
+2 -2
drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
··· 586 586 587 587 if (queue->qid == QID_RX) { 588 588 pipe = usb_rcvbulkpipe(usb_dev, queue->usb_endpoint); 589 - queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe, 0); 589 + queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe); 590 590 } else { 591 591 pipe = usb_sndbulkpipe(usb_dev, queue->usb_endpoint); 592 - queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe, 1); 592 + queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe); 593 593 } 594 594 595 595 if (!queue->usb_maxpacket)