hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/drivers/net/ethernet/3com/3c574_cs.c
....@@ -234,7 +234,7 @@
234234 static struct net_device_stats *el3_get_stats(struct net_device *dev);
235235 static int el3_rx(struct net_device *dev, int worklimit);
236236 static int el3_close(struct net_device *dev);
237
-static void el3_tx_timeout(struct net_device *dev);
237
+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue);
238238 static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
239239 static void set_rx_mode(struct net_device *dev);
240240 static void set_multicast_list(struct net_device *dev);
....@@ -690,7 +690,7 @@
690690 return 0;
691691 }
692692
693
-static void el3_tx_timeout(struct net_device *dev)
693
+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue)
694694 {
695695 unsigned int ioaddr = dev->base_addr;
696696
....@@ -951,7 +951,7 @@
951951 static void update_stats(struct net_device *dev)
952952 {
953953 unsigned int ioaddr = dev->base_addr;
954
- u8 rx, tx, up;
954
+ u8 up;
955955
956956 pr_debug("%s: updating the statistics.\n", dev->name);
957957
....@@ -972,8 +972,8 @@
972972 dev->stats.tx_packets += (up&0x30) << 4;
973973 /* Rx packets */ inb(ioaddr + 7);
974974 /* Tx deferrals */ inb(ioaddr + 8);
975
- rx = inw(ioaddr + 10);
976
- tx = inw(ioaddr + 12);
975
+ /* rx */ inw(ioaddr + 10);
976
+ /* tx */ inw(ioaddr + 12);
977977
978978 EL3WINDOW(4);
979979 /* BadSSD */ inb(ioaddr + 12);
....@@ -1046,7 +1046,7 @@
10461046 switch(cmd) {
10471047 case SIOCGMIIPHY: /* Get the address of the PHY in use. */
10481048 data->phy_id = phy;
1049
- /* fall through */
1049
+ fallthrough;
10501050 case SIOCGMIIREG: /* Read the specified MII register. */
10511051 {
10521052 int saved_window;