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>

diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 15f91d691bba35e0aad802d5d9c02158dbfc8d31..63ce9d81f61b6b000f7d41b6a54b472573219a60 100644 (file)
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -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);
 }
 

diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c
index 415f16662f88eb525815bdced9ff86c7bf86f368..a7433939d091ceeda4242356c802856eceefefa5 100644 (file)
--- a/drivers/net/usb/lan78xx.c
+++ b/drivers/net/usb/lan78xx.c
@@ -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) {

diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 247f58cb0f84e054e225441f519da5fdcfd87867..de0b00bd2eca39206fd6cd7ac3ef939e2db1fabc 100644 (file)
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -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");

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 9a6450f796dcb34abf15ea096d9ff68ef4c11b1a..d5bf5733b2771c5b0464228b8f27466c88ae8cb9 100644 (file)
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -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;

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index a85e192c9d590ee9691eec3ba0816364f7f396fb..1bb92ca7451b2f6d2281f2bb5c6a6e63bdd21909 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -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;
 

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
index 74c3d8cb31002d0ec583fbbda66df4d9efcde6db..0827bc860bf866803572a6a163254194cf2eda05 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c
@@ -586,10 +586,10 @@ static void rt2x00usb_assign_endpoint(struct data_queue *queue,
 
        if (queue->qid == QID_RX) {
                pipe = usb_rcvbulkpipe(usb_dev, queue->usb_endpoint);
-               queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe, 0);
+               queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe);
        } else {
                pipe = usb_sndbulkpipe(usb_dev, queue->usb_endpoint);
-               queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe, 1);
+               queue->usb_maxpacket = usb_maxpacket(usb_dev, pipe);
        }
 
        if (!queue->usb_maxpacket)