AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/net/wireless/intersil/orinoco/main.c
..
..
@@ -647,7 +647,7 @@
647
647
 	netif_wake_queue(dev);
648
648
 }
649
649
 
650
-void orinoco_tx_timeout(struct net_device *dev)
650
+void orinoco_tx_timeout(struct net_device *dev, unsigned int txqueue)
651
651
 {
652
652
 	struct orinoco_private *priv = ndev_priv(dev);
653
653
 	struct net_device_stats *stats = &dev->stats;
..
..
@@ -1062,9 +1062,9 @@
1062
1062
 	stats->rx_dropped++;
1063
1063
 }
1064
1064
 
1065
-static void orinoco_rx_isr_tasklet(unsigned long data)
1065
+static void orinoco_rx_isr_tasklet(struct tasklet_struct *t)
1066
1066
 {
1067
-	struct orinoco_private *priv = (struct orinoco_private *) data;
1067
+	struct orinoco_private *priv = from_tasklet(priv, t, rx_tasklet);
1068
1068
 	struct net_device *dev = priv->ndev;
1069
1069
 	struct orinoco_rx_data *rx_data, *temp;
1070
1070
 	struct hermes_rx_descriptor *desc;
..
..
@@ -1503,7 +1503,7 @@
1503
1503
 			schedule_work(&priv->join_work);
1504
1504
 			break;
1505
1505
 		}
1506
-		/* fall through */
1506
+		fallthrough;
1507
1507
 	case HERMES_INQ_HOSTSCAN:
1508
1508
 	case HERMES_INQ_HOSTSCAN_SYMBOL: {
1509
1509
 		/* Result of a scanning. Contains information about
..
..
@@ -1594,7 +1594,7 @@
1594
1594
 		/* Ignore this frame for now */
1595
1595
 		if (priv->firmware_type == FIRMWARE_TYPE_AGERE)
1596
1596
 			break;
1597
-		/* fall through */
1597
+		fallthrough;
1598
1598
 	default:
1599
1599
 		printk(KERN_DEBUG "%s: Unknown information frame received: "
1600
1600
 		       "type 0x%04x, length %d\n", dev->name, type, len);
..
..
@@ -2198,8 +2198,7 @@
2198
2198
 	INIT_WORK(&priv->wevent_work, orinoco_send_wevents);
2199
2199
 
2200
2200
 	INIT_LIST_HEAD(&priv->rx_list);
2201
-	tasklet_init(&priv->rx_tasklet, orinoco_rx_isr_tasklet,
2202
-		     (unsigned long) priv);
2201
+	tasklet_setup(&priv->rx_tasklet, orinoco_rx_isr_tasklet);
2203
2202
 
2204
2203
 	spin_lock_init(&priv->scan_lock);
2205
2204
 	INIT_LIST_HEAD(&priv->scan_list);