hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/drivers/net/ethernet/xircom/xirc2ps_cs.c
....@@ -288,7 +288,7 @@
288288 */
289289 static netdev_tx_t do_start_xmit(struct sk_buff *skb,
290290 struct net_device *dev);
291
-static void xirc_tx_timeout(struct net_device *dev);
291
+static void xirc_tx_timeout(struct net_device *dev, unsigned int txqueue);
292292 static void xirc2ps_tx_timeout_task(struct work_struct *work);
293293 static void set_addresses(struct net_device *dev);
294294 static void set_multicast_list(struct net_device *dev);
....@@ -1203,7 +1203,7 @@
12031203 }
12041204
12051205 static void
1206
-xirc_tx_timeout(struct net_device *dev)
1206
+xirc_tx_timeout(struct net_device *dev, unsigned int txqueue)
12071207 {
12081208 struct local_info *lp = netdev_priv(dev);
12091209 dev->stats.tx_errors++;
....@@ -1434,7 +1434,7 @@
14341434 switch(cmd) {
14351435 case SIOCGMIIPHY: /* Get the address of the PHY in use. */
14361436 data->phy_id = 0; /* we have only this address */
1437
- /* fall through */
1437
+ fallthrough;
14381438 case SIOCGMIIREG: /* Read the specified MII register. */
14391439 data->val_out = mii_rd(ioaddr, data->phy_id & 0x1f,
14401440 data->reg_num & 0x1f);
....@@ -1473,7 +1473,7 @@
14731473 unsigned int ioaddr = dev->base_addr;
14741474 unsigned value;
14751475
1476
- pr_debug("%s: do_reset(%p,%d)\n", dev? dev->name:"eth?", dev, full);
1476
+ pr_debug("%s: do_reset(%p,%d)\n", dev->name, dev, full);
14771477
14781478 hardreset(dev);
14791479 PutByte(XIRCREG_CR, SoftReset); /* set */