From nobody Sun Feb 8 23:07:12 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 02C7860EDB; Wed, 13 Mar 2024 17:04:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710349480; cv=none; b=MAoTDFYuw6UZYFSFevRW3geRni1j3/x/T1SpWkYRQSWetw4iHpWGBsl7PDakvGLcRdcx/og1X31utcBpFmXSNSxnPi3arLJ9graVKAVh83Yum7nICWKFyAQeCvxAWOeF96YRIFHDlfmVkY2OxFr3wuW5//hdw6yY93qEaCvm470= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710349480; c=relaxed/simple; bh=LqmNTwql1q0D/a6YWkuSr2MWBICkldUD1Tt7qIQlhbM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=o5Nvf7xqFXI0Y1gSAJ4le4hxgH1YcZXg2q9sCGEewYlBt8FjQtzQ9UnD+7TAYIrGiOjqmwYjdvP+9lsl4jdFWeRq9p95iD0BeoA2pCLgP9wxstlRZKt7tL8uFO8n85jR2FegiCWd3hNb87vQehyNCpR4D2pdL83WhgL+jnrFuNg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ihrheryJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ihrheryJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08C0FC43399; Wed, 13 Mar 2024 17:04:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710349479; bh=LqmNTwql1q0D/a6YWkuSr2MWBICkldUD1Tt7qIQlhbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ihrheryJ+vLm+tSnsoTpEKy8vyNgl6wXo+FlX/LP0dYIQ9owiPSwlmkkO2cfaqr4g WpglWSFdYlvjfL+Nit/5EhXc9lx8ZuHfTgpxcI6ow8M0MGLTmaNvTMl3XfAq9dyOgV R5l33RgOginNzzBQrTI0GHOSsu75mskGuojugMg8xHhcHm2CTv9f+3yY66hvx/1/ni pF9r0kYsnQA51sTaLjzplMaqu2T21KnMFhNeke6me5f6NKg0syFKbt1uBF8+xJ97sQ a0w0EGMxI0Q6UudTcjQO3WMQbayPd6r2Xnd7QKLr/pcvKE0X01N/RHMfZwgt+hgPrC PkOwX795nw8KQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lee Jones , Jakub Kicinski , Sasha Levin Subject: [PATCH 4.19 01/41] net: usb: lan78xx: Remove lots of set but unused 'ret' variables Date: Wed, 13 Mar 2024 13:03:55 -0400 Message-ID: <20240313170435.616724-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240313170435.616724-1-sashal@kernel.org> References: <20240313170435.616724-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.310-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.310-rc1 X-KernelTest-Deadline: 2024-03-15T17:04+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable From: Lee Jones [ Upstream commit 06cd7c46b3ab3f2252c61bf85b191236cf0254e1 ] Fixes the following W=3D1 kernel build warning(s): drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_read_raw_otp=E2=80= =99: drivers/net/usb/lan78xx.c:825:6: warning: variable =E2=80=98ret=E2=80=99 s= et but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_write_raw_otp=E2= =80=99: drivers/net/usb/lan78xx.c:879:6: warning: variable =E2=80=98ret=E2=80=99 s= et but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_deferred_multicast= _write=E2=80=99: drivers/net/usb/lan78xx.c:1041:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_update_flowcontrol= =E2=80=99: drivers/net/usb/lan78xx.c:1127:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_init_mac_address= =E2=80=99: drivers/net/usb/lan78xx.c:1666:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_link_status_change= =E2=80=99: drivers/net/usb/lan78xx.c:1841:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_irq_bus_sync_unloc= k=E2=80=99: drivers/net/usb/lan78xx.c:1920:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan8835_fixup=E2=80=99: drivers/net/usb/lan78xx.c:1994:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_set_rx_max_frame_l= ength=E2=80=99: drivers/net/usb/lan78xx.c:2192:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_change_mtu=E2=80= =99: drivers/net/usb/lan78xx.c:2270:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_set_mac_addr=E2=80= =99: drivers/net/usb/lan78xx.c:2299:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_set_features=E2=80= =99: drivers/net/usb/lan78xx.c:2333:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] drivers/net/usb/lan78xx.c: In function =E2=80=98lan78xx_set_suspend=E2=80= =99: drivers/net/usb/lan78xx.c:3807:6: warning: variable =E2=80=98ret=E2=80=99 = set but not used [-Wunused-but-set-variable] Signed-off-by: Lee Jones Link: https://lore.kernel.org/r/20201102114512.1062724-25-lee.jones@linaro.= org Signed-off-by: Jakub Kicinski Stable-dep-of: 1eecc7ab82c4 ("net: lan78xx: fix runtime PM count underflow = on link stop") Signed-off-by: Sasha Levin --- drivers/net/usb/lan78xx.c | 168 ++++++++++++++++++-------------------- 1 file changed, 78 insertions(+), 90 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index c0fff40a98bb8..4d94af63cf190 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -835,20 +835,19 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *d= ev, u32 offset, u32 length, u8 *data) { int i; - int ret; u32 buf; unsigned long timeout; =20 - ret =3D lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + lan78xx_read_reg(dev, OTP_PWR_DN, &buf); =20 if (buf & OTP_PWR_DN_PWRDN_N_) { /* clear it and wait to be cleared */ - ret =3D lan78xx_write_reg(dev, OTP_PWR_DN, 0); + lan78xx_write_reg(dev, OTP_PWR_DN, 0); =20 timeout =3D jiffies + HZ; do { usleep_range(1, 10); - ret =3D lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + lan78xx_read_reg(dev, OTP_PWR_DN, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "timeout on OTP_PWR_DN"); @@ -858,18 +857,18 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *d= ev, u32 offset, } =20 for (i =3D 0; i < length; i++) { - ret =3D lan78xx_write_reg(dev, OTP_ADDR1, + lan78xx_write_reg(dev, OTP_ADDR1, ((offset + i) >> 8) & OTP_ADDR1_15_11); - ret =3D lan78xx_write_reg(dev, OTP_ADDR2, + lan78xx_write_reg(dev, OTP_ADDR2, ((offset + i) & OTP_ADDR2_10_3)); =20 - ret =3D lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_); - ret =3D lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); + lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_); + lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); =20 timeout =3D jiffies + HZ; do { udelay(1); - ret =3D lan78xx_read_reg(dev, OTP_STATUS, &buf); + lan78xx_read_reg(dev, OTP_STATUS, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "timeout on OTP_STATUS"); @@ -877,7 +876,7 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev= , u32 offset, } } while (buf & OTP_STATUS_BUSY_); =20 - ret =3D lan78xx_read_reg(dev, OTP_RD_DATA, &buf); + lan78xx_read_reg(dev, OTP_RD_DATA, &buf); =20 data[i] =3D (u8)(buf & 0xFF); } @@ -889,20 +888,19 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *= dev, u32 offset, u32 length, u8 *data) { int i; - int ret; u32 buf; unsigned long timeout; =20 - ret =3D lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + lan78xx_read_reg(dev, OTP_PWR_DN, &buf); =20 if (buf & OTP_PWR_DN_PWRDN_N_) { /* clear it and wait to be cleared */ - ret =3D lan78xx_write_reg(dev, OTP_PWR_DN, 0); + lan78xx_write_reg(dev, OTP_PWR_DN, 0); =20 timeout =3D jiffies + HZ; do { udelay(1); - ret =3D lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + lan78xx_read_reg(dev, OTP_PWR_DN, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "timeout on OTP_PWR_DN completion"); @@ -912,21 +910,21 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *= dev, u32 offset, } =20 /* set to BYTE program mode */ - ret =3D lan78xx_write_reg(dev, OTP_PRGM_MODE, OTP_PRGM_MODE_BYTE_); + lan78xx_write_reg(dev, OTP_PRGM_MODE, OTP_PRGM_MODE_BYTE_); =20 for (i =3D 0; i < length; i++) { - ret =3D lan78xx_write_reg(dev, OTP_ADDR1, + lan78xx_write_reg(dev, OTP_ADDR1, ((offset + i) >> 8) & OTP_ADDR1_15_11); - ret =3D lan78xx_write_reg(dev, OTP_ADDR2, + lan78xx_write_reg(dev, OTP_ADDR2, ((offset + i) & OTP_ADDR2_10_3)); - ret =3D lan78xx_write_reg(dev, OTP_PRGM_DATA, data[i]); - ret =3D lan78xx_write_reg(dev, OTP_TST_CMD, OTP_TST_CMD_PRGVRFY_); - ret =3D lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); + lan78xx_write_reg(dev, OTP_PRGM_DATA, data[i]); + lan78xx_write_reg(dev, OTP_TST_CMD, OTP_TST_CMD_PRGVRFY_); + lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); =20 timeout =3D jiffies + HZ; do { udelay(1); - ret =3D lan78xx_read_reg(dev, OTP_STATUS, &buf); + lan78xx_read_reg(dev, OTP_STATUS, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "Timeout on OTP_STATUS completion"); @@ -1051,7 +1049,6 @@ static void lan78xx_deferred_multicast_write(struct w= ork_struct *param) container_of(param, struct lan78xx_priv, set_multicast); struct lan78xx_net *dev =3D pdata->dev; int i; - int ret; =20 netif_dbg(dev, drv, dev->net, "deferred multicast write 0x%08x\n", pdata->rfe_ctl); @@ -1060,14 +1057,14 @@ static void lan78xx_deferred_multicast_write(struct= work_struct *param) DP_SEL_VHF_HASH_LEN, pdata->mchash_table); =20 for (i =3D 1; i < NUM_OF_MAF; i++) { - ret =3D lan78xx_write_reg(dev, MAF_HI(i), 0); - ret =3D lan78xx_write_reg(dev, MAF_LO(i), + lan78xx_write_reg(dev, MAF_HI(i), 0); + lan78xx_write_reg(dev, MAF_LO(i), pdata->pfilter_table[i][1]); - ret =3D lan78xx_write_reg(dev, MAF_HI(i), + lan78xx_write_reg(dev, MAF_HI(i), pdata->pfilter_table[i][0]); } =20 - ret =3D lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); + lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); } =20 static void lan78xx_set_multicast(struct net_device *netdev) @@ -1137,7 +1134,6 @@ static int lan78xx_update_flowcontrol(struct lan78xx_= net *dev, u8 duplex, u16 lcladv, u16 rmtadv) { u32 flow =3D 0, fct_flow =3D 0; - int ret; u8 cap; =20 if (dev->fc_autoneg) @@ -1160,10 +1156,10 @@ static int lan78xx_update_flowcontrol(struct lan78x= x_net *dev, u8 duplex, (cap & FLOW_CTRL_RX ? "enabled" : "disabled"), (cap & FLOW_CTRL_TX ? "enabled" : "disabled")); =20 - ret =3D lan78xx_write_reg(dev, FCT_FLOW, fct_flow); + lan78xx_write_reg(dev, FCT_FLOW, fct_flow); =20 /* threshold value should be set before enabling flow */ - ret =3D lan78xx_write_reg(dev, FLOW, flow); + lan78xx_write_reg(dev, FLOW, flow); =20 return 0; } @@ -1694,11 +1690,10 @@ static int lan78xx_ioctl(struct net_device *netdev,= struct ifreq *rq, int cmd) static void lan78xx_init_mac_address(struct lan78xx_net *dev) { u32 addr_lo, addr_hi; - int ret; u8 addr[6]; =20 - ret =3D lan78xx_read_reg(dev, RX_ADDRL, &addr_lo); - ret =3D lan78xx_read_reg(dev, RX_ADDRH, &addr_hi); + lan78xx_read_reg(dev, RX_ADDRL, &addr_lo); + lan78xx_read_reg(dev, RX_ADDRH, &addr_hi); =20 addr[0] =3D addr_lo & 0xFF; addr[1] =3D (addr_lo >> 8) & 0xFF; @@ -1731,12 +1726,12 @@ static void lan78xx_init_mac_address(struct lan78xx= _net *dev) (addr[2] << 16) | (addr[3] << 24); addr_hi =3D addr[4] | (addr[5] << 8); =20 - ret =3D lan78xx_write_reg(dev, RX_ADDRL, addr_lo); - ret =3D lan78xx_write_reg(dev, RX_ADDRH, addr_hi); + lan78xx_write_reg(dev, RX_ADDRL, addr_lo); + lan78xx_write_reg(dev, RX_ADDRH, addr_hi); } =20 - ret =3D lan78xx_write_reg(dev, MAF_LO(0), addr_lo); - ret =3D lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); + lan78xx_write_reg(dev, MAF_LO(0), addr_lo); + lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); =20 ether_addr_copy(dev->net->dev_addr, addr); } @@ -1870,7 +1865,7 @@ static void lan78xx_remove_mdio(struct lan78xx_net *d= ev) static void lan78xx_link_status_change(struct net_device *net) { struct phy_device *phydev =3D net->phydev; - int ret, temp; + int temp; =20 /* At forced 100 F/H mode, chip may fail to set mode correctly * when cable is switched between long(~50+m) and short one. @@ -1881,7 +1876,7 @@ static void lan78xx_link_status_change(struct net_dev= ice *net) /* disable phy interrupt */ temp =3D phy_read(phydev, LAN88XX_INT_MASK); temp &=3D ~LAN88XX_INT_MASK_MDINTPIN_EN_; - ret =3D phy_write(phydev, LAN88XX_INT_MASK, temp); + phy_write(phydev, LAN88XX_INT_MASK, temp); =20 temp =3D phy_read(phydev, MII_BMCR); temp &=3D ~(BMCR_SPEED100 | BMCR_SPEED1000); @@ -1895,7 +1890,7 @@ static void lan78xx_link_status_change(struct net_dev= ice *net) /* enable phy interrupt back */ temp =3D phy_read(phydev, LAN88XX_INT_MASK); temp |=3D LAN88XX_INT_MASK_MDINTPIN_EN_; - ret =3D phy_write(phydev, LAN88XX_INT_MASK, temp); + phy_write(phydev, LAN88XX_INT_MASK, temp); } } =20 @@ -1949,14 +1944,13 @@ static void lan78xx_irq_bus_sync_unlock(struct irq_= data *irqd) struct lan78xx_net *dev =3D container_of(data, struct lan78xx_net, domain_data); u32 buf; - int ret; =20 /* call register access here because irq_bus_lock & irq_bus_sync_unlock * are only two callbacks executed in non-atomic contex. */ - ret =3D lan78xx_read_reg(dev, INT_EP_CTL, &buf); + lan78xx_read_reg(dev, INT_EP_CTL, &buf); if (buf !=3D data->irqenable) - ret =3D lan78xx_write_reg(dev, INT_EP_CTL, data->irqenable); + lan78xx_write_reg(dev, INT_EP_CTL, data->irqenable); =20 mutex_unlock(&data->irq_lock); } @@ -2023,7 +2017,6 @@ static void lan78xx_remove_irq_domain(struct lan78xx_= net *dev) static int lan8835_fixup(struct phy_device *phydev) { int buf; - int ret; struct lan78xx_net *dev =3D netdev_priv(phydev->attached_dev); =20 /* LED2/PME_N/IRQ_N/RGMII_ID pin to IRQ_N mode */ @@ -2033,11 +2026,11 @@ static int lan8835_fixup(struct phy_device *phydev) phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8010, buf); =20 /* RGMII MAC TXC Delay Enable */ - ret =3D lan78xx_write_reg(dev, MAC_RGMII_ID, + lan78xx_write_reg(dev, MAC_RGMII_ID, MAC_RGMII_ID_TXC_DELAY_EN_); =20 /* RGMII TX DLL Tune Adjust */ - ret =3D lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); + lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); =20 dev->interface =3D PHY_INTERFACE_MODE_RGMII_TXID; =20 @@ -2217,28 +2210,27 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) =20 static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int si= ze) { - int ret =3D 0; u32 buf; bool rxenabled; =20 - ret =3D lan78xx_read_reg(dev, MAC_RX, &buf); + lan78xx_read_reg(dev, MAC_RX, &buf); =20 rxenabled =3D ((buf & MAC_RX_RXEN_) !=3D 0); =20 if (rxenabled) { buf &=3D ~MAC_RX_RXEN_; - ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + lan78xx_write_reg(dev, MAC_RX, buf); } =20 /* add 4 to size for FCS */ buf &=3D ~MAC_RX_MAX_SIZE_MASK_; buf |=3D (((size + 4) << MAC_RX_MAX_SIZE_SHIFT_) & MAC_RX_MAX_SIZE_MASK_); =20 - ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + lan78xx_write_reg(dev, MAC_RX, buf); =20 if (rxenabled) { buf |=3D MAC_RX_RXEN_; - ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + lan78xx_write_reg(dev, MAC_RX, buf); } =20 return 0; @@ -2295,13 +2287,12 @@ static int lan78xx_change_mtu(struct net_device *ne= tdev, int new_mtu) int ll_mtu =3D new_mtu + netdev->hard_header_len; int old_hard_mtu =3D dev->hard_mtu; int old_rx_urb_size =3D dev->rx_urb_size; - int ret; =20 /* no second zero-length packet read wanted after mtu-sized packets */ if ((ll_mtu % dev->maxpacket) =3D=3D 0) return -EDOM; =20 - ret =3D lan78xx_set_rx_max_frame_length(dev, new_mtu + VLAN_ETH_HLEN); + lan78xx_set_rx_max_frame_length(dev, new_mtu + VLAN_ETH_HLEN); =20 netdev->mtu =3D new_mtu; =20 @@ -2324,7 +2315,6 @@ static int lan78xx_set_mac_addr(struct net_device *ne= tdev, void *p) struct lan78xx_net *dev =3D netdev_priv(netdev); struct sockaddr *addr =3D p; u32 addr_lo, addr_hi; - int ret; =20 if (netif_running(netdev)) return -EBUSY; @@ -2341,12 +2331,12 @@ static int lan78xx_set_mac_addr(struct net_device *= netdev, void *p) addr_hi =3D netdev->dev_addr[4] | netdev->dev_addr[5] << 8; =20 - ret =3D lan78xx_write_reg(dev, RX_ADDRL, addr_lo); - ret =3D lan78xx_write_reg(dev, RX_ADDRH, addr_hi); + lan78xx_write_reg(dev, RX_ADDRL, addr_lo); + lan78xx_write_reg(dev, RX_ADDRH, addr_hi); =20 /* Added to support MAC address changes */ - ret =3D lan78xx_write_reg(dev, MAF_LO(0), addr_lo); - ret =3D lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); + lan78xx_write_reg(dev, MAF_LO(0), addr_lo); + lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); =20 return 0; } @@ -2358,7 +2348,6 @@ static int lan78xx_set_features(struct net_device *ne= tdev, struct lan78xx_net *dev =3D netdev_priv(netdev); struct lan78xx_priv *pdata =3D (struct lan78xx_priv *)(dev->data[0]); unsigned long flags; - int ret; =20 spin_lock_irqsave(&pdata->rfe_ctl_lock, flags); =20 @@ -2382,7 +2371,7 @@ static int lan78xx_set_features(struct net_device *ne= tdev, =20 spin_unlock_irqrestore(&pdata->rfe_ctl_lock, flags); =20 - ret =3D lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); + lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); =20 return 0; } @@ -3846,7 +3835,6 @@ static u16 lan78xx_wakeframe_crc16(const u8 *buf, int= len) static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) { u32 buf; - int ret; int mask_index; u16 crc; u32 temp_wucsr; @@ -3855,26 +3843,26 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) const u8 ipv6_multicast[3] =3D { 0x33, 0x33 }; const u8 arp_type[2] =3D { 0x08, 0x06 }; =20 - ret =3D lan78xx_read_reg(dev, MAC_TX, &buf); + lan78xx_read_reg(dev, MAC_TX, &buf); buf &=3D ~MAC_TX_TXEN_; - ret =3D lan78xx_write_reg(dev, MAC_TX, buf); - ret =3D lan78xx_read_reg(dev, MAC_RX, &buf); + lan78xx_write_reg(dev, MAC_TX, buf); + lan78xx_read_reg(dev, MAC_RX, &buf); buf &=3D ~MAC_RX_RXEN_; - ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + lan78xx_write_reg(dev, MAC_RX, buf); =20 - ret =3D lan78xx_write_reg(dev, WUCSR, 0); - ret =3D lan78xx_write_reg(dev, WUCSR2, 0); - ret =3D lan78xx_write_reg(dev, WK_SRC, 0xFFF1FF1FUL); + lan78xx_write_reg(dev, WUCSR, 0); + lan78xx_write_reg(dev, WUCSR2, 0); + lan78xx_write_reg(dev, WK_SRC, 0xFFF1FF1FUL); =20 temp_wucsr =3D 0; =20 temp_pmt_ctl =3D 0; - ret =3D lan78xx_read_reg(dev, PMT_CTL, &temp_pmt_ctl); + lan78xx_read_reg(dev, PMT_CTL, &temp_pmt_ctl); temp_pmt_ctl &=3D ~PMT_CTL_RES_CLR_WKP_EN_; temp_pmt_ctl |=3D PMT_CTL_RES_CLR_WKP_STS_; =20 for (mask_index =3D 0; mask_index < NUM_OF_WUF_CFG; mask_index++) - ret =3D lan78xx_write_reg(dev, WUF_CFG(mask_index), 0); + lan78xx_write_reg(dev, WUF_CFG(mask_index), 0); =20 mask_index =3D 0; if (wol & WAKE_PHY) { @@ -3903,30 +3891,30 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) =20 /* set WUF_CFG & WUF_MASK for IPv4 Multicast */ crc =3D lan78xx_wakeframe_crc16(ipv4_multicast, 3); - ret =3D lan78xx_write_reg(dev, WUF_CFG(mask_index), + lan78xx_write_reg(dev, WUF_CFG(mask_index), WUF_CFGX_EN_ | WUF_CFGX_TYPE_MCAST_ | (0 << WUF_CFGX_OFFSET_SHIFT_) | (crc & WUF_CFGX_CRC16_MASK_)); =20 - ret =3D lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7); - ret =3D lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); - ret =3D lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); - ret =3D lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7); + lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); mask_index++; =20 /* for IPv6 Multicast */ crc =3D lan78xx_wakeframe_crc16(ipv6_multicast, 2); - ret =3D lan78xx_write_reg(dev, WUF_CFG(mask_index), + lan78xx_write_reg(dev, WUF_CFG(mask_index), WUF_CFGX_EN_ | WUF_CFGX_TYPE_MCAST_ | (0 << WUF_CFGX_OFFSET_SHIFT_) | (crc & WUF_CFGX_CRC16_MASK_)); =20 - ret =3D lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3); - ret =3D lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); - ret =3D lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); - ret =3D lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3); + lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); mask_index++; =20 temp_pmt_ctl |=3D PMT_CTL_WOL_EN_; @@ -3947,16 +3935,16 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) * for packettype (offset 12,13) =3D ARP (0x0806) */ crc =3D lan78xx_wakeframe_crc16(arp_type, 2); - ret =3D lan78xx_write_reg(dev, WUF_CFG(mask_index), + lan78xx_write_reg(dev, WUF_CFG(mask_index), WUF_CFGX_EN_ | WUF_CFGX_TYPE_ALL_ | (0 << WUF_CFGX_OFFSET_SHIFT_) | (crc & WUF_CFGX_CRC16_MASK_)); =20 - ret =3D lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000); - ret =3D lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); - ret =3D lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); - ret =3D lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000); + lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); + lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); mask_index++; =20 temp_pmt_ctl |=3D PMT_CTL_WOL_EN_; @@ -3964,7 +3952,7 @@ static int lan78xx_set_suspend(struct lan78xx_net *de= v, u32 wol) temp_pmt_ctl |=3D PMT_CTL_SUS_MODE_0_; } =20 - ret =3D lan78xx_write_reg(dev, WUCSR, temp_wucsr); + lan78xx_write_reg(dev, WUCSR, temp_wucsr); =20 /* when multiple WOL bits are set */ if (hweight_long((unsigned long)wol) > 1) { @@ -3972,16 +3960,16 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) temp_pmt_ctl &=3D ~PMT_CTL_SUS_MODE_MASK_; temp_pmt_ctl |=3D PMT_CTL_SUS_MODE_0_; } - ret =3D lan78xx_write_reg(dev, PMT_CTL, temp_pmt_ctl); + lan78xx_write_reg(dev, PMT_CTL, temp_pmt_ctl); =20 /* clear WUPS */ - ret =3D lan78xx_read_reg(dev, PMT_CTL, &buf); + lan78xx_read_reg(dev, PMT_CTL, &buf); buf |=3D PMT_CTL_WUPS_MASK_; - ret =3D lan78xx_write_reg(dev, PMT_CTL, buf); + lan78xx_write_reg(dev, PMT_CTL, buf); =20 - ret =3D lan78xx_read_reg(dev, MAC_RX, &buf); + lan78xx_read_reg(dev, MAC_RX, &buf); buf |=3D MAC_RX_RXEN_; - ret =3D lan78xx_write_reg(dev, MAC_RX, buf); + lan78xx_write_reg(dev, MAC_RX, buf); =20 return 0; } --=20 2.43.0