Skip to content

Commit e13adbf

Browse files
vincent-mailholgregkh
authored andcommitted
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 <[email protected]> CC: David S. Miller <[email protected]> CC: Jakub Kicinski <[email protected]> CC: Woojung Huh <[email protected]> CC: Felix Fietkau <[email protected]> CC: Lorenzo Bianconi <[email protected]> CC: Ryder Lee <[email protected]> CC: Kalle Valo <[email protected]> CC: Matthias Brugger <[email protected]> CC: Stanislaw Gruszka <[email protected]> CC: Helmut Schaa <[email protected]> Signed-off-by: Vincent Mailhol <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 61f879a commit e13adbf

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

drivers/net/usb/cdc_ncm.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ static void cdc_ncm_update_rxtx_max(struct usbnet *dev, u32 new_rx, u32 new_tx)
441441
* .bind which is called before usbnet sets up dev->maxpacket
442442
*/
443443
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)
445445
val++;
446446

447447
/* 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)
465465
usbnet_update_max_qlen(dev);
466466

467467
/* 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),
469469
CDC_NCM_MIN_TX_PKT, ctx->tx_max);
470470
}
471471

drivers/net/usb/lan78xx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4423,7 +4423,7 @@ static int lan78xx_probe(struct usb_interface *intf,
44234423
goto out4;
44244424

44254425
period = ep_intr->desc.bInterval;
4426-
maxp = usb_maxpacket(dev->udev, dev->pipe_intr, 0);
4426+
maxp = usb_maxpacket(dev->udev, dev->pipe_intr);
44274427
buf = kmalloc(maxp, GFP_KERNEL);
44284428
if (!buf) {
44294429
ret = -ENOMEM;
@@ -4441,7 +4441,7 @@ static int lan78xx_probe(struct usb_interface *intf,
44414441
dev->urb_intr->transfer_flags |= URB_FREE_BUFFER;
44424442
}
44434443

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

44464446
/* Reject broken descriptors. */
44474447
if (dev->maxpacket == 0) {

drivers/net/usb/rndis_host.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
333333
net->hard_header_len += sizeof (struct rndis_data_hdr);
334334
dev->hard_mtu = net->mtu + net->hard_header_len;
335335

336-
dev->maxpacket = usb_maxpacket(dev->udev, dev->out, 1);
336+
dev->maxpacket = usb_maxpacket(dev->udev, dev->out);
337337
if (dev->maxpacket == 0) {
338338
netif_dbg(dev, probe, dev->net,
339339
"dev->maxpacket can't be 0\n");

drivers/net/usb/usbnet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ static int init_status (struct usbnet *dev, struct usb_interface *intf)
229229
pipe = usb_rcvintpipe (dev->udev,
230230
dev->status->desc.bEndpointAddress
231231
& USB_ENDPOINT_NUMBER_MASK);
232-
maxp = usb_maxpacket (dev->udev, pipe, 0);
232+
maxp = usb_maxpacket(dev->udev, pipe);
233233

234234
/* avoid 1 msec chatter: min 8 msec poll rate */
235235
period = max ((int) dev->status->desc.bInterval,
@@ -1789,7 +1789,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
17891789

17901790
if (!dev->rx_urb_size)
17911791
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);
17931793
if (dev->maxpacket == 0) {
17941794
/* that is a broken device */
17951795
status = -ENODEV;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ int __mt76u_init(struct mt76_dev *dev, struct usb_interface *intf,
10681068

10691069
INIT_WORK(&usb->stat_work, mt76u_tx_status_data);
10701070

1071-
usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0), 1);
1071+
usb->data_len = usb_maxpacket(udev, usb_sndctrlpipe(udev, 0));
10721072
if (usb->data_len < 32)
10731073
usb->data_len = 32;
10741074

drivers/net/wireless/ralink/rt2x00/rt2x00usb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,10 +586,10 @@ static void rt2x00usb_assign_endpoint(struct data_queue *queue,
586586

587587
if (queue->qid == QID_RX) {
588588
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);
590590
} else {
591591
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);
593593
}
594594

595595
if (!queue->usb_maxpacket)

0 commit comments

Comments
 (0)