fpsensor: Rename fpsensor_detect functions

Rename get_fp_sensor_type and get_fp_sensor_spi_select to
fpsensor_detect_get_type and fpsensor_detect_get_spi_select to be more
consistent with other APIs

BRANCH=none
BUG=b:256674283
TEST=./util/compare_build.sh -b all -j 120
         => MATCH

Change-Id: Ie548ff5b33079cbc607cb9552efdfe9676da4c02
Signed-off-by: Bobby Casey <bobbycasey@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4283704
Reviewed-by: Tom Hughes <tomhughes@chromium.org>

9 files changed, 15 insertions, 15 deletions

diff --git a/board/hatch_fp/fpsensor_detect_rw.c b/board/hatch_fp/fpsensor_detect_rw.c
index 2a313cda18..e69f0e0000 100644
--- a/board/hatch_fp/fpsensor_detect_rw.c
+++ b/board/hatch_fp/fpsensor_detect_rw.c
@@ -7,7 +7,7 @@
 #include "gpio.h"
 #include "timer.h"
 
-enum fp_sensor_type get_fp_sensor_type(void)
+enum fp_sensor_type fpsensor_detect_get_type(void)
 {
 	enum fp_sensor_type ret;
 
@@ -32,7 +32,7 @@ enum fp_sensor_type get_fp_sensor_type(void)
 	return ret;
 }
 
-enum fp_sensor_spi_select get_fp_sensor_spi_select(void)
+enum fp_sensor_spi_select fpsensor_detect_get_spi_select(void)
 {
 	return FP_SENSOR_SPI_SELECT_PRODUCTION;
 }
diff --git a/board/nocturne_fp/board_rw.c b/board/nocturne_fp/board_rw.c
index 6c6de4fbae..c8bc225aa7 100644
--- a/board/nocturne_fp/board_rw.c
+++ b/board/nocturne_fp/board_rw.c
@@ -101,7 +101,7 @@ static void spi_configure(enum fp_sensor_spi_select spi_select)
 
 void board_init(void)
 {
-	enum fp_sensor_spi_select spi_select = get_fp_sensor_spi_select();
+	enum fp_sensor_spi_select spi_select = fpsensor_detect_get_spi_select();
 
 	/*
 	 * FP_RST_ODL pin is defined in gpio_rw.inc (with GPIO_OUT_HIGH
diff --git a/board/nocturne_fp/fpsensor_detect_rw.c b/board/nocturne_fp/fpsensor_detect_rw.c
index d26927c187..adc2690998 100644
--- a/board/nocturne_fp/fpsensor_detect_rw.c
+++ b/board/nocturne_fp/fpsensor_detect_rw.c
@@ -7,12 +7,12 @@
 #include "gpio.h"
 #include "timer.h"
 
-enum fp_sensor_type get_fp_sensor_type(void)
+enum fp_sensor_type fpsensor_detect_get_type(void)
 {
 	return FP_SENSOR_TYPE_FPC;
 }
 
-enum fp_sensor_spi_select get_fp_sensor_spi_select(void)
+enum fp_sensor_spi_select fpsensor_detect_get_spi_select(void)
 {
 	enum fp_sensor_spi_select ret;
 
diff --git a/board/nucleo-dartmonkey/fpsensor_detect.c b/board/nucleo-dartmonkey/fpsensor_detect.c
index 7a9c128211..07dee3d0cb 100644
--- a/board/nucleo-dartmonkey/fpsensor_detect.c
+++ b/board/nucleo-dartmonkey/fpsensor_detect.c
@@ -5,7 +5,7 @@
 
 #include "fpsensor_detect.h"
 
-enum fp_sensor_type get_fp_sensor_type(void)
+enum fp_sensor_type fpsensor_detect_get_type(void)
 {
 	return FP_SENSOR_TYPE_FPC;
 }
diff --git a/common/fpsensor/fpsensor.cc b/common/fpsensor/fpsensor.cc
index 48d8007e88..19b917dea0 100644
--- a/common/fpsensor/fpsensor.cc
+++ b/common/fpsensor/fpsensor.cc
@@ -235,7 +235,7 @@ extern "C" void fp_task(void)
 	int timeout_us = -1;
 
 	CPRINTS("FP_SENSOR_SEL: %s",
-		fp_sensor_type_to_str(get_fp_sensor_type()));
+		fp_sensor_type_to_str(fpsensor_detect_get_type()));
 
 #ifdef HAVE_FP_PRIVATE_DRIVER
 	/* Reset and initialize the sensor IC */
diff --git a/common/mock/fpsensor_detect_mock.c b/common/mock/fpsensor_detect_mock.c
index 50f27f92bf..928c2fe6ec 100644
--- a/common/mock/fpsensor_detect_mock.c
+++ b/common/mock/fpsensor_detect_mock.c
@@ -12,9 +12,9 @@
 struct mock_ctrl_fpsensor_detect mock_ctrl_fpsensor_detect =
 	MOCK_CTRL_DEFAULT_FPSENSOR_DETECT;
 
-enum fp_sensor_type get_fp_sensor_type(void)
+enum fp_sensor_type fpsensor_detect_get_type(void)
 {
-	return mock_ctrl_fpsensor_detect.get_fp_sensor_type_return;
+	return mock_ctrl_fpsensor_detect.fpsensor_detect_get_type_return;
 }
 
 enum fp_transport_type get_fp_transport_type(void)
@@ -22,7 +22,7 @@ enum fp_transport_type get_fp_transport_type(void)
 	return mock_ctrl_fpsensor_detect.get_fp_transport_type_return;
 }
 
-enum fp_sensor_spi_select get_fp_sensor_spi_select(void)
+enum fp_sensor_spi_select fpsensor_detect_get_spi_select(void)
 {
 	return mock_ctrl_fpsensor_detect.get_fp_sensor_spi_select_return;
 }
diff --git a/include/fpsensor_detect.h b/include/fpsensor_detect.h
index b8d7b398d5..13ee1f73f6 100644
--- a/include/fpsensor_detect.h
+++ b/include/fpsensor_detect.h
@@ -17,9 +17,9 @@ extern "C" {
 const char *fp_transport_type_to_str(enum fp_transport_type type);
 const char *fp_sensor_type_to_str(enum fp_sensor_type type);
 const char *fp_sensor_spi_select_to_str(enum fp_sensor_spi_select type);
-enum fp_sensor_type get_fp_sensor_type(void);
+enum fp_sensor_type fpsensor_detect_get_type(void);
 enum fp_transport_type get_fp_transport_type(void);
-enum fp_sensor_spi_select get_fp_sensor_spi_select(void);
+enum fp_sensor_spi_select fpsensor_detect_get_spi_select(void);
 
 #ifdef __cplusplus
 }
diff --git a/include/mock/fpsensor_detect_mock.h b/include/mock/fpsensor_detect_mock.h
index b8594ebdd9..e68704115c 100644
--- a/include/mock/fpsensor_detect_mock.h
+++ b/include/mock/fpsensor_detect_mock.h
@@ -9,14 +9,14 @@
 #include "fpsensor_detect.h"
 
 struct mock_ctrl_fpsensor_detect {
-	enum fp_sensor_type get_fp_sensor_type_return;
+	enum fp_sensor_type fpsensor_detect_get_type_return;
 	enum fp_transport_type get_fp_transport_type_return;
 	enum fp_sensor_spi_select get_fp_sensor_spi_select_return;
 };
 
 #define MOCK_CTRL_DEFAULT_FPSENSOR_DETECT                                  \
 	{                                                                  \
-		.get_fp_sensor_type_return = FP_SENSOR_TYPE_UNKNOWN,       \
+		.fpsensor_detect_get_type_return = FP_SENSOR_TYPE_UNKNOWN, \
 		.get_fp_transport_type_return = FP_TRANSPORT_TYPE_UNKNOWN, \
 		.get_fp_sensor_spi_select_return =                         \
 			FP_SENSOR_SPI_SELECT_UNKNOWN                       \
diff --git a/test/fpsensor.c b/test/fpsensor.c
index d7ddcbebcb..a1947f7844 100644
--- a/test/fpsensor.c
+++ b/test/fpsensor.c
@@ -53,7 +53,7 @@ test_static int test_host_command_protocol_info(
 	struct ec_response_get_protocol_info info;
 	int rv;
 
-	mock_ctrl_fpsensor_detect.get_fp_sensor_type_return =
+	mock_ctrl_fpsensor_detect.fpsensor_detect_get_type_return =
 		FP_SENSOR_TYPE_FPC;
 	mock_ctrl_fpsensor_detect.get_fp_transport_type_return = transport_type;