change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/arch/x86/kernel/mpparse.c
..
..
@@ -11,7 +11,6 @@
11
11
 #include <linux/mm.h>
12
12
 #include <linux/init.h>
13
13
 #include <linux/delay.h>
14
-#include <linux/bootmem.h>
15
14
 #include <linux/memblock.h>
16
15
 #include <linux/kernel_stat.h>
17
16
 #include <linux/mc146818rtc.h>
..
..
@@ -20,11 +19,11 @@
20
19
 #include <linux/smp.h>
21
20
 #include <linux/pci.h>
22
21
 
22
+#include <asm/io_apic.h>
23
+#include <asm/acpi.h>
23
24
 #include <asm/irqdomain.h>
24
25
 #include <asm/mtrr.h>
25
26
 #include <asm/mpspec.h>
26
-#include <asm/pgalloc.h>
27
-#include <asm/io_apic.h>
28
27
 #include <asm/proto.h>
29
28
 #include <asm/bios_ebda.h>
30
29
 #include <asm/e820/api.h>
..
..
@@ -46,11 +45,6 @@
46
45
 	return sum & 0xFF;
47
46
 }
48
47
 
49
-int __init default_mpc_apic_id(struct mpc_cpu *m)
50
-{
51
-	return m->apicid;
52
-}
53
-
54
48
 static void __init MP_processor_info(struct mpc_cpu *m)
55
49
 {
56
50
 	int apicid;
..
..
@@ -61,7 +55,7 @@
61
55
 		return;
62
56
 	}
63
57
 
64
-	apicid = x86_init.mpparse.mpc_apic_id(m);
58
+	apicid = m->apicid;
65
59
 
66
60
 	if (m->cpuflag & CPU_BOOTPROCESSOR) {
67
61
 		bootup_cpu = " (Bootup-CPU)";
..
..
@@ -73,7 +67,7 @@
73
67
 }
74
68
 
75
69
 #ifdef CONFIG_X86_IO_APIC
76
-void __init default_mpc_oem_bus_info(struct mpc_bus *m, char *str)
70
+static void __init mpc_oem_bus_info(struct mpc_bus *m, char *str)
77
71
 {
78
72
 	memcpy(str, m->bustype, 6);
79
73
 	str[6] = 0;
..
..
@@ -84,7 +78,7 @@
84
78
 {
85
79
 	char str[7];
86
80
 
87
-	x86_init.mpparse.mpc_oem_bus_info(m, str);
81
+	mpc_oem_bus_info(m, str);
88
82
 
89
83
 #if MAX_MP_BUSSES < 256
90
84
 	if (m->busid >= MAX_MP_BUSSES) {
..
..
@@ -100,9 +94,6 @@
100
94
 		mp_bus_id_to_type[m->busid] = MP_BUS_ISA;
101
95
 #endif
102
96
 	} else if (strncmp(str, BUSTYPE_PCI, sizeof(BUSTYPE_PCI) - 1) == 0) {
103
-		if (x86_init.mpparse.mpc_oem_pci_bus)
104
-			x86_init.mpparse.mpc_oem_pci_bus(m);
105
-
106
97
 		clear_bit(m->busid, mp_bus_not_pci);
107
98
 #ifdef CONFIG_EISA
108
99
 		mp_bus_id_to_type[m->busid] = MP_BUS_PCI;
..
..
@@ -198,8 +189,6 @@
198
189
 			1, mpc, mpc->length, 1);
199
190
 }
200
191
 
201
-void __init default_smp_read_mpc_oem(struct mpc_table *mpc) { }
202
-
203
192
 static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
204
193
 {
205
194
 	char str[16];
..
..
@@ -218,14 +207,7 @@
218
207
 	if (early)
219
208
 		return 1;
220
209
 
221
-	if (mpc->oemptr)
222
-		x86_init.mpparse.smp_read_mpc_oem(mpc);
223
-
224
-	/*
225
-	 *      Now process the configuration blocks.
226
-	 */
227
-	x86_init.mpparse.mpc_record(0);
228
-
210
+	/* Now process the configuration blocks. */
229
211
 	while (count < mpc->length) {
230
212
 		switch (*mpt) {
231
213
 		case MP_PROCESSOR:
..
..
@@ -256,7 +238,6 @@
256
238
 			count = mpc->length;
257
239
 			break;
258
240
 		}
259
-		x86_init.mpparse.mpc_record(1);
260
241
 	}
261
242
 
262
243
 	if (!num_processors)
..
..
@@ -312,7 +293,7 @@
312
293
 		case 2:
313
294
 			if (i == 0 || i == 13)
314
295
 				continue;	/* IRQ0 & IRQ13 not connected */
315
-			/* fall through */
296
+			fallthrough;
316
297
 		default:
317
298
 			if (i == 2)
318
299
 				continue;	/* IRQ2 is never connected */
..
..
@@ -356,7 +337,7 @@
356
337
 	default:
357
338
 		pr_err("???\nUnknown standard configuration %d\n",
358
339
 		       mpc_default_type);
359
-		/* fall through */
340
+		fallthrough;
360
341
 	case 1:
361
342
 	case 5:
362
343
 		memcpy(bus.bustype, "ISA   ", 6);