mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/cpufreq/speedstep-centrino.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * cpufreq driver for Enhanced SpeedStep, as found in Intel's Pentium
3
4
  * M (part of the Centrino chipset).
..
..
@@ -412,7 +413,7 @@
412
413
 }
413
414
 
414
415
 /**
415
- * centrino_setpolicy - set a new CPUFreq policy
416
+ * centrino_target - set a new CPUFreq policy
416
417
  * @policy: new policy
417
418
  * @index: index of target frequency
418
419
  *
..
..
@@ -519,18 +520,12 @@
519
520
  * or ASCII model IDs.
520
521
  */
521
522
 static const struct x86_cpu_id centrino_ids[] = {
522
-	{ X86_VENDOR_INTEL, 6, 9, X86_FEATURE_EST },
523
-	{ X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
524
-	{ X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
525
-	{ X86_VENDOR_INTEL, 6, 13, X86_FEATURE_EST },
526
-	{ X86_VENDOR_INTEL, 15, 3, X86_FEATURE_EST },
527
-	{ X86_VENDOR_INTEL, 15, 4, X86_FEATURE_EST },
523
+	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL,  6,  9, X86_FEATURE_EST, NULL),
524
+	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL,  6, 13, X86_FEATURE_EST, NULL),
525
+	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15,  3, X86_FEATURE_EST, NULL),
526
+	X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15,  4, X86_FEATURE_EST, NULL),
528
527
 	{}
529
528
 };
530
-#if 0
531
-/* Autoload or not? Do not for now. */
532
-MODULE_DEVICE_TABLE(x86cpu, centrino_ids);
533
-#endif
534
529
 
535
530
 /**
536
531
  * centrino_init - initializes the Enhanced SpeedStep CPUFreq driver