移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/ethernet/3com/3c574_cs.c
..
..
@@ -234,7 +234,7 @@
234
234
 static struct net_device_stats *el3_get_stats(struct net_device *dev);
235
235
 static int el3_rx(struct net_device *dev, int worklimit);
236
236
 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);
238
238
 static int el3_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
239
239
 static void set_rx_mode(struct net_device *dev);
240
240
 static void set_multicast_list(struct net_device *dev);
..
..
@@ -690,7 +690,7 @@
690
690
 	return 0;
691
691
 }
692
692
 
693
-static void el3_tx_timeout(struct net_device *dev)
693
+static void el3_tx_timeout(struct net_device *dev, unsigned int txqueue)
694
694
 {
695
695
 	unsigned int ioaddr = dev->base_addr;
696
696
 	
..
..
@@ -951,7 +951,7 @@
951
951
 static void update_stats(struct net_device *dev)
952
952
 {
953
953
 	unsigned int ioaddr = dev->base_addr;
954
-	u8 rx, tx, up;
954
+	u8 up;
955
955
 
956
956
 	pr_debug("%s: updating the statistics.\n", dev->name);
957
957
 
..
..
@@ -972,8 +972,8 @@
972
972
 	dev->stats.tx_packets			+= (up&0x30) << 4;
973
973
 	/* Rx packets   */			   inb(ioaddr + 7);
974
974
 	/* 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);
977
977
 
978
978
 	EL3WINDOW(4);
979
979
 	/* BadSSD */				   inb(ioaddr + 12);
..
..
@@ -1046,7 +1046,7 @@
1046
1046
 	switch(cmd) {
1047
1047
 	case SIOCGMIIPHY:		/* Get the address of the PHY in use. */
1048
1048
 		data->phy_id = phy;
1049
-		/* fall through */
1049
+		fallthrough;
1050
1050
 	case SIOCGMIIREG:		/* Read the specified MII register. */
1051
1051
 		{
1052
1052
 			int saved_window;