usb: gadget: ether: Inline functions used once

These functions here are only ever called once since drop of non-DM
networking code. Inline them. No functional change.

Signed-off-by: Marek Vasut <marex@denx.de>
Tested-by: Tom Rini <trini@konsulko.com>
Tested-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c
index 85c971e4c43e7015304f2563005a38e895401f3c..88c656c4dc01f6990bc0d65e3b71c8a815acda6a 100644 (file)
--- a/drivers/usb/gadget/ether.c
+++ b/drivers/usb/gadget/ether.c
@@ -2273,10 +2273,11 @@ fail:
 }
 
 /*-------------------------------------------------------------------------*/
-static void _usb_eth_halt(struct ether_priv *priv);
+static void usb_eth_stop(struct udevice *dev);
 
-static int _usb_eth_init(struct ether_priv *priv)
+static int usb_eth_start(struct udevice *udev)
 {
+       struct ether_priv *priv = dev_get_priv(udev);
        struct eth_dev *dev = &priv->ethdev;
        struct usb_gadget *gadget;
        unsigned long ts;
@@ -2347,12 +2348,13 @@ static int _usb_eth_init(struct ether_priv *priv)
        rx_submit(dev, dev->rx_req, 0);
        return 0;
 fail:
-       _usb_eth_halt(priv);
+       usb_eth_stop(udev);
        return -1;
 }
 
-static int _usb_eth_send(struct ether_priv *priv, void *packet, int length)
+static int usb_eth_send(struct udevice *udev, void *packet, int length)
 {
+       struct ether_priv *priv = dev_get_priv(udev);
        int                     retval;
        void                    *rndis_pkt = NULL;
        struct eth_dev          *dev = &priv->ethdev;
@@ -2419,15 +2421,9 @@ drop:
        return -ENOMEM;
 }
 
-static int _usb_eth_recv(struct ether_priv *priv)
-{
-       usb_gadget_handle_interrupts(0);
-
-       return 0;
-}
-
-static void _usb_eth_halt(struct ether_priv *priv)
+static void usb_eth_stop(struct udevice *udev)
 {
+       struct ether_priv *priv = dev_get_priv(udev);
        struct eth_dev *dev = &priv->ethdev;
 
        /* If the gadget not registered, simple return */
@@ -2459,31 +2455,12 @@ static void _usb_eth_halt(struct ether_priv *priv)
        usb_gadget_release(0);
 }
 
-static int usb_eth_start(struct udevice *dev)
-{
-       struct ether_priv *priv = dev_get_priv(dev);
-
-       return _usb_eth_init(priv);
-}
-
-static int usb_eth_send(struct udevice *dev, void *packet, int length)
-{
-       struct ether_priv *priv = dev_get_priv(dev);
-
-       return _usb_eth_send(priv, packet, length);
-}
-
 static int usb_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 {
        struct ether_priv *priv = dev_get_priv(dev);
        struct eth_dev *ethdev = &priv->ethdev;
-       int ret;
 
-       ret = _usb_eth_recv(priv);
-       if (ret) {
-               pr_err("error packet receive\n");
-               return ret;
-       }
+       usb_gadget_handle_interrupts(0);
 
        if (packet_received) {
                if (ethdev->rx_req) {
@@ -2509,13 +2486,6 @@ static int usb_eth_free_pkt(struct udevice *dev, uchar *packet,
        return rx_submit(ethdev, ethdev->rx_req, 0);
 }
 
-static void usb_eth_stop(struct udevice *dev)
-{
-       struct ether_priv *priv = dev_get_priv(dev);
-
-       _usb_eth_halt(priv);
-}
-
 static int usb_eth_probe(struct udevice *dev)
 {
        struct ether_priv *priv = dev_get_priv(dev);