From patchwork Sat Feb 17 00:04:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 874711 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="bMhjh4XI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zjqyM40BYz9sRW for ; Sat, 17 Feb 2018 11:04:59 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 19468C220DB; Sat, 17 Feb 2018 00:04:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 39FE8C2204F; Sat, 17 Feb 2018 00:04:51 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7671FC2204D; Sat, 17 Feb 2018 00:04:49 +0000 (UTC) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by lists.denx.de (Postfix) with ESMTPS id EEA4AC21D72 for ; Sat, 17 Feb 2018 00:04:48 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id u15so4456822wrg.3 for ; Fri, 16 Feb 2018 16:04:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=W8FM5FFm0aJfIDf/L5BC1bi2w+/giD1ceKIrCfwkgqA=; b=bMhjh4XIa5AM7wGcS/klByT8rsxSQUz6JO+sI1ZCeNhcB4DjdZyh3Ytnua6fguUZg/ 02x+9+J/xR8u2OnbCyBXu4a/CgqPsw2Tj6MAbwhFjParEycSbY42cAnJt7oXIiSuWNjS +3Wpxo3ZI4BhJYcJdkIuO+xmnd7WjHCJbIj0RhQVjAQQRge7PMTIQ645dzSa2tjATGrR xzjjaj43jvrlD83dA7tPG4GOkXw8KNovQBX8etFESbZZnlpZrc+EdN12OvsYRLsPRIMP 7Xe793GapJ6R1/9crwfgHQVWsDF2PCvczMNHFMCRPMha4aN0MOcEGwIbxQIA4MND0XLR 7tfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=W8FM5FFm0aJfIDf/L5BC1bi2w+/giD1ceKIrCfwkgqA=; b=gl4E4lCZ2Rj/8X+fsr1rhWfKqvBcMcJwhdyDvJa9M8mBcUz1p9tbofhLO6smKZSbZ8 6hRezqMGlQFD2y956I9xj7K5glW2746y3Q5Pv9ii3d/L4e2S/f0ePU6YkiZFeCG2/fuo 9G/HisUn3dypBthZzLOFqJqzXhoSuxquO+5DCGz2nyD7QdKkew7BT1hyqjlDw/VRKrhs Hw9xZvD0cFYmcg+XdC+yPwRwXXV7qH+c0y2oVO7RA4ybQrEZ1Z6ijRehysfx9/O21fqB KJKxSla31yrM4mHVD2pqdS8aSC58htcX4eH5BBJBahqbAqQBLb1oz7dXiAZvkl/TX1Pn NZ2A== X-Gm-Message-State: APf1xPDmQn1dvjk5cTWFgUz74cq8r2UOHCCnxy6uNjQVfqlclA94zYwb 24xSPehay+s43iVs2WphHS7gMpe+ X-Google-Smtp-Source: AH8x224vLm6AseRetsN0KpOdcdtyqGBaJkh8PHPL99/1VC+/8i+ldCiWSiECjpu+xVJ1OfhHR39T+Q== X-Received: by 10.223.169.4 with SMTP id u4mr6485045wrc.170.1518825888292; Fri, 16 Feb 2018 16:04:48 -0800 (PST) Received: from kurokawa.lan (ip-86-49-107-50.net.upcbroadband.cz. [86.49.107.50]) by smtp.gmail.com with ESMTPSA id r68sm5927095wmr.14.2018.02.16.16.04.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Feb 2018 16:04:47 -0800 (PST) From: Marek Vasut X-Google-Original-From: Marek Vasut To: u-boot@lists.denx.de Date: Sat, 17 Feb 2018 01:04:41 +0100 Message-Id: <20180217000444.8375-1-marek.vasut+renesas@gmail.com> X-Mailer: git-send-email 2.15.1 Cc: Joe Hershberger , Marek Vasut Subject: [U-Boot] [PATCH 1/4] net: sh_eth: Zap port variable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Inline this variable which is quite useless. Signed-off-by: Marek Vasut Cc: Nobuhiro Iwamatsu Cc: Joe Hershberger Acked-by: Joe Hershberger --- drivers/net/sh_eth.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 5a5c6bc39e..b3c0509989 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c @@ -63,8 +63,8 @@ static int sh_eth_send_common(struct sh_eth_dev *eth, void *packet, int len) { - int port = eth->port, ret = 0, timeout; - struct sh_eth_info *port_info = ð->port_info[port]; + int ret = 0, timeout; + struct sh_eth_info *port_info = ð->port_info[eth->port]; if (!packet || len > 0xffff) { printf(SHETHER_NAME ": %s: Invalid argument\n", __func__); @@ -120,8 +120,8 @@ err: static int sh_eth_recv_start(struct sh_eth_dev *eth) { - int port = eth->port, len = 0; - struct sh_eth_info *port_info = ð->port_info[port]; + int len = 0; + struct sh_eth_info *port_info = ð->port_info[eth->port]; /* Check if the rx descriptor is ready */ invalidate_cache(port_info->rx_desc_cur, sizeof(struct rx_desc_s)); @@ -192,9 +192,9 @@ static int sh_eth_reset(struct sh_eth_dev *eth) static int sh_eth_tx_desc_init(struct sh_eth_dev *eth) { - int port = eth->port, i, ret = 0; + int i, ret = 0; u32 alloc_desc_size = NUM_TX_DESC * sizeof(struct tx_desc_s); - struct sh_eth_info *port_info = ð->port_info[port]; + struct sh_eth_info *port_info = ð->port_info[eth->port]; struct tx_desc_s *cur_tx_desc; /* @@ -245,9 +245,9 @@ err: static int sh_eth_rx_desc_init(struct sh_eth_dev *eth) { - int port = eth->port, i, ret = 0; + int i, ret = 0; u32 alloc_desc_size = NUM_RX_DESC * sizeof(struct rx_desc_s); - struct sh_eth_info *port_info = ð->port_info[port]; + struct sh_eth_info *port_info = ð->port_info[eth->port]; struct rx_desc_s *cur_rx_desc; u8 *rx_buf; @@ -318,8 +318,7 @@ err: static void sh_eth_tx_desc_free(struct sh_eth_dev *eth) { - int port = eth->port; - struct sh_eth_info *port_info = ð->port_info[port]; + struct sh_eth_info *port_info = ð->port_info[eth->port]; if (port_info->tx_desc_alloc) { free(port_info->tx_desc_alloc); @@ -329,8 +328,7 @@ static void sh_eth_tx_desc_free(struct sh_eth_dev *eth) static void sh_eth_rx_desc_free(struct sh_eth_dev *eth) { - int port = eth->port; - struct sh_eth_info *port_info = ð->port_info[port]; + struct sh_eth_info *port_info = ð->port_info[eth->port]; if (port_info->rx_desc_alloc) { free(port_info->rx_desc_alloc); @@ -523,7 +521,7 @@ static int sh_eth_start_common(struct sh_eth_dev *eth) static int sh_eth_phy_config_legacy(struct sh_eth_dev *eth) { int port = eth->port, ret = 0; - struct sh_eth_info *port_info = ð->port_info[port]; + struct sh_eth_info *port_info = ð->port_info[eth->port]; struct eth_device *dev = port_info->dev; struct phy_device *phydev; @@ -546,7 +544,7 @@ static int sh_eth_send_legacy(struct eth_device *dev, void *packet, int len) static int sh_eth_recv_common(struct sh_eth_dev *eth) { int port = eth->port, len = 0; - struct sh_eth_info *port_info = ð->port_info[port]; + struct sh_eth_info *port_info = ð->port_info[eth->port]; uchar *packet = (uchar *)ADDR_TO_P2(port_info->rx_desc_cur->rd2); len = sh_eth_recv_start(eth); @@ -750,8 +748,8 @@ static int sh_eth_phy_config(struct udevice *dev) struct sh_ether_priv *priv = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_platdata(dev); struct sh_eth_dev *eth = &priv->shdev; - int port = eth->port, ret = 0; - struct sh_eth_info *port_info = ð->port_info[port]; + int ret = 0; + struct sh_eth_info *port_info = ð->port_info[eth->port]; struct phy_device *phydev; int mask = 0xffffffff;