mb/*/*/acpi_tables: Remove unnecessary function call

Remove acpi_update_thermal_table local function.

Change-Id: I4857348088feb8eaf1dd7f553c4efb29da8943cf
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36212
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>

17 files changed, 42 insertions, 127 deletions

diff --git a/src/mainboard/lenovo/l520/acpi_tables.c b/src/mainboard/lenovo/l520/acpi_tables.c
index 31f41e7561..20a8dbf122 100644
--- a/src/mainboard/lenovo/l520/acpi_tables.c
+++ b/src/mainboard/lenovo/l520/acpi_tables.c
@@ -19,12 +19,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -38,5 +32,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/s230u/acpi_tables.c b/src/mainboard/lenovo/s230u/acpi_tables.c
index 8d6d93f1c3..405f3c23b1 100644
--- a/src/mainboard/lenovo/s230u/acpi_tables.c
+++ b/src/mainboard/lenovo/s230u/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	/* The LID is open by default */
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t400/acpi_tables.c b/src/mainboard/lenovo/t400/acpi_tables.c
index 953a2b84bf..85a3d7eeda 100644
--- a/src/mainboard/lenovo/t400/acpi_tables.c
+++ b/src/mainboard/lenovo/t400/acpi_tables.c
@@ -22,12 +22,6 @@
 #include <southbridge/intel/i82801ix/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	memset((void *)gnvs, 0, sizeof(*gnvs));
@@ -38,7 +32,8 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lenovo/t420/acpi_tables.c b/src/mainboard/lenovo/t420/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/t420/acpi_tables.c
+++ b/src/mainboard/lenovo/t420/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t420s/acpi_tables.c b/src/mainboard/lenovo/t420s/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/t420s/acpi_tables.c
+++ b/src/mainboard/lenovo/t420s/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t430/acpi_tables.c b/src/mainboard/lenovo/t430/acpi_tables.c
index 5caa3d43d9..87f9c34979 100644
--- a/src/mainboard/lenovo/t430/acpi_tables.c
+++ b/src/mainboard/lenovo/t430/acpi_tables.c
@@ -16,21 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tmps = CTDP_SENSOR_ID;
-
-	gnvs->f1of = CTDP_NOMINAL_THRESHOLD_OFF;
-	gnvs->f1on = CTDP_NOMINAL_THRESHOLD_ON;
-
-	gnvs->f0of = CTDP_DOWN_THRESHOLD_OFF;
-	gnvs->f0on = CTDP_DOWN_THRESHOLD_ON;
-
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-	gnvs->tmax = MAX_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -44,5 +29,15 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tmps = CTDP_SENSOR_ID;
+
+	gnvs->f1of = CTDP_NOMINAL_THRESHOLD_OFF;
+	gnvs->f1on = CTDP_NOMINAL_THRESHOLD_ON;
+
+	gnvs->f0of = CTDP_DOWN_THRESHOLD_OFF;
+	gnvs->f0on = CTDP_DOWN_THRESHOLD_ON;
+
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
+	gnvs->tmax = MAX_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t430s/acpi_tables.c b/src/mainboard/lenovo/t430s/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/t430s/acpi_tables.c
+++ b/src/mainboard/lenovo/t430s/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t520/acpi_tables.c b/src/mainboard/lenovo/t520/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/t520/acpi_tables.c
+++ b/src/mainboard/lenovo/t520/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t530/acpi_tables.c b/src/mainboard/lenovo/t530/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/t530/acpi_tables.c
+++ b/src/mainboard/lenovo/t530/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/t60/acpi_tables.c b/src/mainboard/lenovo/t60/acpi_tables.c
index bd10a0e3fb..abffdda939 100644
--- a/src/mainboard/lenovo/t60/acpi_tables.c
+++ b/src/mainboard/lenovo/t60/acpi_tables.c
@@ -18,17 +18,12 @@
 #include <southbridge/intel/i82801gx/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Enable both COM ports */
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/x131e/acpi_tables.c b/src/mainboard/lenovo/x131e/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/x131e/acpi_tables.c
+++ b/src/mainboard/lenovo/x131e/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c b/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/x200/acpi_tables.c b/src/mainboard/lenovo/x200/acpi_tables.c
index 953a2b84bf..85a3d7eeda 100644
--- a/src/mainboard/lenovo/x200/acpi_tables.c
+++ b/src/mainboard/lenovo/x200/acpi_tables.c
@@ -22,12 +22,6 @@
 #include <southbridge/intel/i82801ix/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	memset((void *)gnvs, 0, sizeof(*gnvs));
@@ -38,7 +32,8 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
 
 unsigned long acpi_fill_madt(unsigned long current)
diff --git a/src/mainboard/lenovo/x201/acpi_tables.c b/src/mainboard/lenovo/x201/acpi_tables.c
index 6fd47d7276..6a29ba0f64 100644
--- a/src/mainboard/lenovo/x201/acpi_tables.c
+++ b/src/mainboard/lenovo/x201/acpi_tables.c
@@ -18,13 +18,8 @@
 #include <southbridge/intel/ibexpeak/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
+void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	gnvs->tcrt = CRITICAL_TEMPERATURE;
 	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
-
-void acpi_create_gnvs(global_nvs_t * gnvs)
-{
-	acpi_update_thermal_table(gnvs);
-}
diff --git a/src/mainboard/lenovo/x220/acpi_tables.c b/src/mainboard/lenovo/x220/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/x220/acpi_tables.c
+++ b/src/mainboard/lenovo/x220/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/x230/acpi_tables.c b/src/mainboard/lenovo/x230/acpi_tables.c
index 279674d002..a6c103f74c 100644
--- a/src/mainboard/lenovo/x230/acpi_tables.c
+++ b/src/mainboard/lenovo/x230/acpi_tables.c
@@ -16,12 +16,6 @@
 #include <southbridge/intel/bd82x6x/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Disable USB ports in S3 by default */
@@ -35,5 +29,6 @@ void acpi_create_gnvs(global_nvs_t *gnvs)
 	// the lid is open by default.
 	gnvs->lids = 1;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }
diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index bd10a0e3fb..abffdda939 100644
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -18,17 +18,12 @@
 #include <southbridge/intel/i82801gx/nvs.h>
 #include "thermal.h"
 
-static void acpi_update_thermal_table(global_nvs_t *gnvs)
-{
-	gnvs->tcrt = CRITICAL_TEMPERATURE;
-	gnvs->tpsv = PASSIVE_TEMPERATURE;
-}
-
 void acpi_create_gnvs(global_nvs_t *gnvs)
 {
 	/* Enable both COM ports */
 	gnvs->cmap = 0x01;
 	gnvs->cmbp = 0x01;
 
-	acpi_update_thermal_table(gnvs);
+	gnvs->tcrt = CRITICAL_TEMPERATURE;
+	gnvs->tpsv = PASSIVE_TEMPERATURE;
 }