diff --git a/src/cpu/intel/haswell/acpi.c b/src/cpu/intel/haswell/acpi.c
index 1e1c724dbe..66d58adef2 100644
--- a/src/cpu/intel/haswell/acpi.c
+++ b/src/cpu/intel/haswell/acpi.c
@@ -327,30 +327,26 @@ static void generate_P_state_entries(int core, int cores_per_package)
 
 void generate_cpu_entries(const struct device *device)
 {
-	int coreID, cpuID;
 	int totalcores = dev_count_cpu();
 	int cores_per_package = get_logical_cores_per_package();
-	int numcpus = totalcores/cores_per_package;
+	int numcpus = totalcores / cores_per_package;
 
 	printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n",
 	       numcpus, cores_per_package);
 
-	for (cpuID = 1; cpuID <= numcpus; cpuID++) {
-		for (coreID = 1; coreID <= cores_per_package; coreID++) {
+	for (int cpu_id = 0; cpu_id < numcpus; cpu_id++) {
+		for (int core_id = 0; core_id < cores_per_package; core_id++) {
 			/* Generate Scope(\_SB) { Device(CPUx */
-			acpigen_write_processor_device(
-				(cpuID - 1) * cores_per_package+coreID - 1);
+			acpigen_write_processor_device(cpu_id * cores_per_package + core_id);
 
 			/* Generate P-state tables */
-			generate_P_state_entries(
-				coreID - 1, cores_per_package);
+			generate_P_state_entries(core_id, cores_per_package);
 
 			/* Generate C-state tables */
 			generate_C_state_entries(device);
 
 			/* Generate T-state tables */
-			generate_T_state_entries(
-				cpuID - 1, cores_per_package);
+			generate_T_state_entries(cpu_id, cores_per_package);
 
 			acpigen_write_processor_device_end();
 		}
diff --git a/src/cpu/intel/model_2065x/acpi.c b/src/cpu/intel/model_2065x/acpi.c
index 834a3bbeee..370ea96518 100644
--- a/src/cpu/intel/model_2065x/acpi.c
+++ b/src/cpu/intel/model_2065x/acpi.c
@@ -205,30 +205,26 @@ static void generate_P_state_entries(int core, int cores_per_package)
 
 void generate_cpu_entries(const struct device *device)
 {
-	int coreID, cpuID;
 	int totalcores = dev_count_cpu();
 	int cores_per_package = get_cores_per_package();
-	int numcpus = totalcores/cores_per_package;
+	int numcpus = totalcores / cores_per_package;
 
 	printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n",
 	       numcpus, cores_per_package);
 
-	for (cpuID = 1; cpuID <= numcpus; cpuID++) {
-		for (coreID = 1; coreID <= cores_per_package; coreID++) {
+	for (int cpu_id = 0; cpu_id < numcpus; cpu_id++) {
+		for (int core_id = 0; core_id < cores_per_package; core_id++) {
 			/* Generate Scope(\_SB) { Device(CPUx */
-			acpigen_write_processor_device(
-				(cpuID-1)*cores_per_package+coreID-1);
+			acpigen_write_processor_device(cpu_id * cores_per_package + core_id);
 
 			/* Generate P-state tables */
-			generate_P_state_entries(
-				cpuID-1, cores_per_package);
+			generate_P_state_entries(cpu_id, cores_per_package);
 
 			/* Generate C-state tables */
 			generate_C_state_entries();
 
 			/* Generate T-state tables */
-			generate_T_state_entries(
-				cpuID-1, cores_per_package);
+			generate_T_state_entries(cpu_id, cores_per_package);
 
 			acpigen_write_processor_device_end();
 		}
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index d7c048d519..a10f8dc66e 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -296,30 +296,26 @@ static void generate_P_state_entries(int core, int cores_per_package)
 
 void generate_cpu_entries(const struct device *device)
 {
-	int coreID, cpuID;
 	int totalcores = dev_count_cpu();
 	int cores_per_package = get_logical_cores_per_package();
-	int numcpus = totalcores/cores_per_package;
+	int numcpus = totalcores / cores_per_package;
 
 	printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n",
 	       numcpus, cores_per_package);
 
-	for (cpuID = 1; cpuID <= numcpus; cpuID++) {
-		for (coreID = 1; coreID <= cores_per_package; coreID++) {
-			/* Generate Scope(\_SB) { Device(CPU */
-			acpigen_write_processor_device(
-				(cpuID-1)*cores_per_package+coreID-1);
+	for (int cpu_id = 0; cpu_id < numcpus; cpu_id++) {
+		for (int core_id = 0; core_id < cores_per_package; core_id++) {
+			/* Generate Scope(\_SB) { Device(CPUx */
+			acpigen_write_processor_device(cpu_id * cores_per_package + core_id);
 
 			/* Generate P-state tables */
-			generate_P_state_entries(
-				cpuID-1, cores_per_package);
+			generate_P_state_entries(cpu_id, cores_per_package);
 
 			/* Generate C-state tables */
 			generate_C_state_entries(device);
 
 			/* Generate T-state tables */
-			generate_T_state_entries(
-				cpuID-1, cores_per_package);
+			generate_T_state_entries(cpu_id, cores_per_package);
 
 			acpigen_write_processor_device_end();
 		}