AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/arch/sh/kernel/cpu/shmobile/cpuidle.c
..
..
@@ -1,13 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0
1
2
 /*
2
3
  * arch/sh/kernel/cpu/shmobile/cpuidle.c
3
4
  *
4
5
  * Cpuidle support code for SuperH Mobile
5
6
  *
6
7
  *  Copyright (C) 2009 Magnus Damm
7
- *
8
- * This file is subject to the terms and conditions of the GNU General Public
9
- * License.  See the file "COPYING" in the main directory of this archive
10
- * for more details.
11
8
  */
12
9
 #include <linux/init.h>
13
10
 #include <linux/kernel.h>
..
..
@@ -70,7 +67,7 @@
70
67
 			.enter = cpuidle_sleep_enter,
71
68
 			.name = "C2",
72
69
 			.desc = "SuperH Sleep Mode [SF]",
73
-			.disabled = true,
70
+			.flags = CPUIDLE_FLAG_UNUSABLE,
74
71
 		},
75
72
 		{
76
73
 			.exit_latency = 2300,
..
..
@@ -79,7 +76,7 @@
79
76
 			.enter = cpuidle_sleep_enter,
80
77
 			.name = "C3",
81
78
 			.desc = "SuperH Mobile Standby Mode [SF]",
82
-			.disabled = true,
79
+			.flags = CPUIDLE_FLAG_UNUSABLE,
83
80
 		},
84
81
 	},
85
82
 	.safe_state_index = 0,
..
..
@@ -89,10 +86,10 @@
89
86
 int __init sh_mobile_setup_cpuidle(void)
90
87
 {
91
88
 	if (sh_mobile_sleep_supported & SUSP_SH_SF)
92
-		cpuidle_driver.states[1].disabled = false;
89
+		cpuidle_driver.states[1].flags = CPUIDLE_FLAG_NONE;
93
90
 
94
91
 	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
95
-		cpuidle_driver.states[2].disabled = false;
92
+		cpuidle_driver.states[2].flags = CPUIDLE_FLAG_NONE;
96
93
 
97
94
 	return cpuidle_register(&cpuidle_driver, NULL);
98
95
 }