From nobody Fri Dec 19 17:34:18 2025 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 EC7AF60EF7; Wed, 13 Mar 2024 17:04:40 +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=1710349481; cv=none; b=TcutEnHc5Wya8QfIY1MK+qJrLZ27538hux7u59zTHmtknXd21VpUCwhwr8CK++Wwat7yl4Or/UEfppZxUdLgxYBgTwYTs4lJ0/G/1vSBWheyja/sbXLqt9sDg1Qqx/0W8kJZQx0dkmn2M/eDnGuHl+jNj446Zs3akNz20ikS8rk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710349481; c=relaxed/simple; bh=4Abb+MVNgzXfSodg8DfPY0g6C3fckhgqfbQVzxu5Ytw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S/8cPZcO6GWIuvNyIR+/O/qA573uG+6fNfO2IRttfyUKzSLaeN8ub1FdRohnFFcyjcNfO8+0bSPYdMWg7r6sFiLnyaQLuwcA2YzLT0E0c72WbkuSzFgcIdSNh1RCLlmC4Mqeatvzy6CS72BpEZMGyu9BeiGdUMcOjjygqlf3uvM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oPNchxku; 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="oPNchxku" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21BDAC433B2; Wed, 13 Mar 2024 17:04:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710349480; bh=4Abb+MVNgzXfSodg8DfPY0g6C3fckhgqfbQVzxu5Ytw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oPNchxku+GoDhA4XDJ56gIviws+FWrVoqyKzAD9ukAP6aELjkPnxJyKvhNlsBf9Jb tXdah/LU4bJubG+ES7TluI04LpgSfCN2zFW45Cl66K1SzM8yD/zV6nSrvLicQ6lDO5 vYYpNPh9u5hYYeZVYPhH6QCUHzB6NIsUX3Kq9COBC7x0R1Z3v5gwvkA/rpqtNvZnRF 5RNepV5fvdkE/nbX74gG1ImRxVjIw9vPgSZTlmBrnXZSQdalQnBAknutwkZblP2aYw Nx6dGR42Cls5T+YRR2ATdTayQCBxRGFvMp0KbXoPLmbu1ZIlTTnAXxt7vw7U6u36I1 yAN17B04VVcIQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: John Efstathiades , "David S . Miller" , Sasha Levin Subject: [PATCH 4.19 02/41] lan78xx: Fix white space and style issues Date: Wed, 13 Mar 2024 13:03:56 -0400 Message-ID: <20240313170435.616724-3-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 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 Content-Type: text/plain; charset="utf-8" From: John Efstathiades [ Upstream commit 9ceec7d33adf9647293f24d2fd9a055b89c63864 ] Fix white space and code style issues identified by checkpatch. Signed-off-by: John Efstathiades Signed-off-by: David S. Miller Stable-dep-of: 1eecc7ab82c4 ("net: lan78xx: fix runtime PM count underflow = on link stop") Signed-off-by: Sasha Levin --- drivers/net/usb/lan78xx.c | 80 ++++++++++++++++++++------------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index 4d94af63cf190..2f4f85e03df2c 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c @@ -396,7 +396,7 @@ struct lan78xx_net { struct usb_anchor deferred; =20 struct mutex phy_mutex; /* for phy access */ - unsigned pipe_in, pipe_out, pipe_intr; + unsigned int pipe_in, pipe_out, pipe_intr; =20 u32 hard_mtu; /* count any extra framing */ size_t rx_urb_size; /* size for rx urbs */ @@ -406,7 +406,7 @@ struct lan78xx_net { wait_queue_head_t *wait; unsigned char suspend_count; =20 - unsigned maxpacket; + unsigned int maxpacket; struct timer_list delay; struct timer_list stat_monitor; =20 @@ -515,7 +515,7 @@ static int lan78xx_read_stats(struct lan78xx_net *dev, if (likely(ret >=3D 0)) { src =3D (u32 *)stats; dst =3D (u32 *)data; - for (i =3D 0; i < sizeof(*stats)/sizeof(u32); i++) { + for (i =3D 0; i < sizeof(*stats) / sizeof(u32); i++) { le32_to_cpus(&src[i]); dst[i] =3D src[i]; } @@ -529,10 +529,11 @@ static int lan78xx_read_stats(struct lan78xx_net *dev, return ret; } =20 -#define check_counter_rollover(struct1, dev_stats, member) { \ - if (struct1->member < dev_stats.saved.member) \ - dev_stats.rollover_count.member++; \ - } +#define check_counter_rollover(struct1, dev_stats, member) \ + do { \ + if ((struct1)->member < (dev_stats).saved.member) \ + (dev_stats).rollover_count.member++; \ + } while (0) =20 static void lan78xx_check_stat_rollover(struct lan78xx_net *dev, struct lan78xx_statstage *stats) @@ -858,9 +859,9 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev= , u32 offset, =20 for (i =3D 0; i < length; i++) { lan78xx_write_reg(dev, OTP_ADDR1, - ((offset + i) >> 8) & OTP_ADDR1_15_11); + ((offset + i) >> 8) & OTP_ADDR1_15_11); lan78xx_write_reg(dev, OTP_ADDR2, - ((offset + i) & OTP_ADDR2_10_3)); + ((offset + i) & OTP_ADDR2_10_3)); =20 lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_); lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); @@ -914,9 +915,9 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *de= v, u32 offset, =20 for (i =3D 0; i < length; i++) { lan78xx_write_reg(dev, OTP_ADDR1, - ((offset + i) >> 8) & OTP_ADDR1_15_11); + ((offset + i) >> 8) & OTP_ADDR1_15_11); lan78xx_write_reg(dev, OTP_ADDR2, - ((offset + i) & OTP_ADDR2_10_3)); + ((offset + i) & OTP_ADDR2_10_3)); 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_); @@ -973,7 +974,7 @@ static int lan78xx_dataport_wait_not_busy(struct lan78x= x_net *dev) usleep_range(40, 100); } =20 - netdev_warn(dev->net, "lan78xx_dataport_wait_not_busy timed out"); + netdev_warn(dev->net, "%s timed out", __func__); =20 return -EIO; } @@ -986,7 +987,7 @@ static int lan78xx_dataport_write(struct lan78xx_net *d= ev, u32 ram_select, int i, ret; =20 if (usb_autopm_get_interface(dev->intf) < 0) - return 0; + return 0; =20 mutex_lock(&pdata->dataport_mutex); =20 @@ -1059,9 +1060,9 @@ static void lan78xx_deferred_multicast_write(struct w= ork_struct *param) for (i =3D 1; i < NUM_OF_MAF; i++) { lan78xx_write_reg(dev, MAF_HI(i), 0); lan78xx_write_reg(dev, MAF_LO(i), - pdata->pfilter_table[i][1]); + pdata->pfilter_table[i][1]); lan78xx_write_reg(dev, MAF_HI(i), - pdata->pfilter_table[i][0]); + pdata->pfilter_table[i][0]); } =20 lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); @@ -1080,11 +1081,12 @@ static void lan78xx_set_multicast(struct net_device= *netdev) RFE_CTL_DA_PERFECT_ | RFE_CTL_MCAST_HASH_); =20 for (i =3D 0; i < DP_SEL_VHF_HASH_LEN; i++) - pdata->mchash_table[i] =3D 0; + pdata->mchash_table[i] =3D 0; + /* pfilter_table[0] has own HW address */ for (i =3D 1; i < NUM_OF_MAF; i++) { - pdata->pfilter_table[i][0] =3D - pdata->pfilter_table[i][1] =3D 0; + pdata->pfilter_table[i][0] =3D 0; + pdata->pfilter_table[i][1] =3D 0; } =20 pdata->rfe_ctl |=3D RFE_CTL_BCAST_EN_; @@ -1279,9 +1281,10 @@ static void lan78xx_status(struct lan78xx_net *dev, = struct urb *urb) generic_handle_irq(dev->domain_data.phyirq); local_irq_enable(); } - } else + } else { netdev_warn(dev->net, "unexpected interrupt: 0x%08x\n", intdata); + } } =20 static int lan78xx_ethtool_get_eeprom_len(struct net_device *netdev) @@ -1370,7 +1373,7 @@ static void lan78xx_get_wol(struct net_device *netdev, struct lan78xx_priv *pdata =3D (struct lan78xx_priv *)(dev->data[0]); =20 if (usb_autopm_get_interface(dev->intf) < 0) - return; + return; =20 ret =3D lan78xx_read_reg(dev, USB_CFG0, &buf); if (unlikely(ret < 0)) { @@ -2027,7 +2030,7 @@ static int lan8835_fixup(struct phy_device *phydev) =20 /* RGMII MAC TXC Delay Enable */ lan78xx_write_reg(dev, MAC_RGMII_ID, - MAC_RGMII_ID_TXC_DELAY_EN_); + MAC_RGMII_ID_TXC_DELAY_EN_); =20 /* RGMII TX DLL Tune Adjust */ lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); @@ -3383,9 +3386,10 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) if (skb) dev_kfree_skb_any(skb); usb_free_urb(urb); - } else + } else { netif_dbg(dev, tx_queued, dev->net, "> tx, len %d, type 0x%x\n", length, skb->protocol); + } } =20 static void lan78xx_rx_bh(struct lan78xx_net *dev) @@ -3486,7 +3490,7 @@ static void lan78xx_delayedwork(struct work_struct *w= ork) unlink_urbs(dev, &dev->rxq); status =3D usb_autopm_get_interface(dev->intf); if (status < 0) - goto fail_halt; + goto fail_halt; status =3D usb_clear_halt(dev->udev, dev->pipe_in); usb_autopm_put_interface(dev->intf); if (status < 0 && @@ -3659,8 +3663,8 @@ static int lan78xx_probe(struct usb_interface *intf, struct net_device *netdev; struct usb_device *udev; int ret; - unsigned maxp; - unsigned period; + unsigned int maxp; + unsigned int period; u8 *buf =3D NULL; =20 udev =3D interface_to_usbdev(intf); @@ -3892,10 +3896,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) /* set WUF_CFG & WUF_MASK for IPv4 Multicast */ crc =3D lan78xx_wakeframe_crc16(ipv4_multicast, 3); 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_)); + WUF_CFGX_EN_ | + WUF_CFGX_TYPE_MCAST_ | + (0 << WUF_CFGX_OFFSET_SHIFT_) | + (crc & WUF_CFGX_CRC16_MASK_)); =20 lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7); lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); @@ -3906,10 +3910,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) /* for IPv6 Multicast */ crc =3D lan78xx_wakeframe_crc16(ipv6_multicast, 2); 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_)); + WUF_CFGX_EN_ | + WUF_CFGX_TYPE_MCAST_ | + (0 << WUF_CFGX_OFFSET_SHIFT_) | + (crc & WUF_CFGX_CRC16_MASK_)); =20 lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3); lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); @@ -3936,10 +3940,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *= dev, u32 wol) */ crc =3D lan78xx_wakeframe_crc16(arp_type, 2); 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_)); + WUF_CFGX_EN_ | + WUF_CFGX_TYPE_ALL_ | + (0 << WUF_CFGX_OFFSET_SHIFT_) | + (crc & WUF_CFGX_CRC16_MASK_)); =20 lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000); lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); @@ -4087,7 +4091,7 @@ static int lan78xx_resume(struct usb_interface *intf) if (!--dev->suspend_count) { /* resume interrupt URBs */ if (dev->urb_intr && test_bit(EVENT_DEV_OPEN, &dev->flags)) - usb_submit_urb(dev->urb_intr, GFP_NOIO); + usb_submit_urb(dev->urb_intr, GFP_NOIO); =20 spin_lock_irq(&dev->txq.lock); while ((res =3D usb_get_from_anchor(&dev->deferred))) { --=20 2.43.0