Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6CEE9C001DB for ; Fri, 4 Aug 2023 15:41:26 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C31DC8691A; Fri, 4 Aug 2023 17:41:24 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1691163684; bh=XGZE0j5Q612MU+ppNk+wFCwZ9/zKszoYSuDXPqQpDT0=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=Uq+AHH7Atrixx594IGAnsDTQncn3lZEmXBeOUh47NYpFPvFoMzso3DHU8gl75QcDR eBk+ZRX5ipXng2nj/2t0nlAb87VvFCm8Lx7OfpHkTKaXntlnYVV0ZJTmTwz0soCXp/ kb9V2h+lqVd/nJyzbPj1F0dIMcMSkgSJgSM5e0e4a9WB3oRRm/6xYIR7BqncdX30GB srgzyMDgtcAUsYKDrNFZVJzkHbe6FM4h7dUpTrqeMP/EnXzIPQa0BZ1ws7uRaTV2iH ue7S2hCX0UuKtIDGHJPv5Mt6+bGi96jDF8KP4P5szZ9HTMAM/KkkFfdwpBnzgposCu w0JKfWl1BDX7w== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id D9A6D863E8; Fri, 4 Aug 2023 17:41:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1691163684; bh=XGZE0j5Q612MU+ppNk+wFCwZ9/zKszoYSuDXPqQpDT0=; h=From:To:Cc:Subject:Date:From; b=uKxICrnWg79bBK52czl8HcePS5Fxn8Vrzs7F1Mh6NIBwv5SMkUZNbA/QjVz2bhR/x KMk2pLrVmeYi2Jj4y8xGps/6kdcfWcSILn3w1NwRKnXufUJdKKXhJWGf5jtKEYolbc 5q8YTHpCYkXaqftbt5PkbY4U+xupzVhwgBfVfAJAi+PyviCck3TNnpZTYSI7UGWavp 838i3V1Nu+hVuFhky2ez/S4c7lqln4pjXbb6ZWUWuzg67wmhq1DdC1Lp8cFc8O2qVs i5t8pXSoL+iu0uP4qa/8BS/sqoKM9TeR8tvJZYh2oGVXH/FBmmwV2Kc8XDvZ5TuxJP o8jDIyks9Zdyg== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Kevin Hilman , Lukasz Majewski , Miquel Raynal , Simon Glass Subject: [PATCH v5 1/3] usb: gadget: ether: Inline functions used once Date: Fri, 4 Aug 2023 17:41:09 +0200 Message-Id: <20230804154111.97042-1-marex@denx.de> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean 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 --- Cc: Kevin Hilman Cc: Lukasz Majewski Cc: Miquel Raynal Cc: Simon Glass --- V2: No change V3: No change V4: No change V5: No change --- drivers/usb/gadget/ether.c | 48 +++++++------------------------------- 1 file changed, 9 insertions(+), 39 deletions(-) diff --git a/drivers/usb/gadget/ether.c b/drivers/usb/gadget/ether.c index 85c971e4c43..88c656c4dc0 100644 --- 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); -- 2.40.1