fpsensor: Utilize a common set of CPRINT functions

Replace multiple copies of CPRINTF and CPRINTS with the common version
from fpsensor_utils.h.

BRANCH=none
BUG=none
TEST=compare_builds passes

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

5 files changed, 5 insertions, 16 deletions

diff --git a/driver/fingerprint/elan/elan_private.c b/driver/fingerprint/elan/elan_private.c
index 410efd1cef..1b56a1c9f5 100644
--- a/driver/fingerprint/elan/elan_private.c
+++ b/driver/fingerprint/elan/elan_private.c
@@ -10,6 +10,7 @@
 #include "elan_sensor_pal.h"
 #include "elan_setting.h"
 #include "fpsensor.h"
+#include "fpsensor_utils.h"
 #include "gpio.h"
 #include "link_defs.h"
 #include "math_util.h"
@@ -24,8 +25,6 @@
 
 static uint16_t errors;
 
-#define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
-
 /* Sensor description */
 static struct ec_response_fp_info ec_fp_sensor_info = {
 	/* Sensor identification */
diff --git a/driver/fingerprint/fpc/bep/fpc_private.c b/driver/fingerprint/fpc/bep/fpc_private.c
index 9480854ef1..007b7692b9 100644
--- a/driver/fingerprint/fpc/bep/fpc_private.c
+++ b/driver/fingerprint/fpc/bep/fpc_private.c
@@ -6,6 +6,7 @@
 #include "driver/fingerprint/fpc/fpc_sensor.h"
 #include "fpc_bio_algorithm.h"
 #include "fpsensor.h"
+#include "fpsensor_utils.h"
 #include "gpio.h"
 #include "spi.h"
 #include "system.h"
@@ -14,10 +15,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* Console output macros */
-#define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
-#define CPRINTS(format, args...) cprints(CC_FP, format, ##args)
-
 static uint8_t
 	enroll_ctx[FP_ALGORITHM_ENROLLMENT_SIZE_FPC] __aligned(4) = { 0 };
 
diff --git a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c
index 2380637a61..74bdff0bf6 100644
--- a/driver/fingerprint/fpc/bep/fpc_sensor_spi.c
+++ b/driver/fingerprint/fpc/bep/fpc_sensor_spi.c
@@ -9,6 +9,7 @@
 #include "driver/fingerprint/fpc/fpc_sensor.h"
 #include "fpc_sensor_spi.h"
 #include "fpsensor.h"
+#include "fpsensor_utils.h"
 #include "gpio.h"
 #include "spi.h"
 #include "util.h"
@@ -17,10 +18,6 @@
 #include <stddef.h>
 #include <stdint.h>
 
-/* Console output macros */
-#define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
-#define CPRINTS(format, args...) cprints(CC_FP, format, ##args)
-
 #define SPI_BUF_SIZE (1024)
 
 #define FPC_RESULT_OK (0)
diff --git a/driver/fingerprint/fpc/libfp/fpc_private.c b/driver/fingerprint/fpc/libfp/fpc_private.c
index 07d08fb6d4..3e40962631 100644
--- a/driver/fingerprint/fpc/libfp/fpc_private.c
+++ b/driver/fingerprint/fpc/libfp/fpc_private.c
@@ -9,6 +9,7 @@
 #include "fpc_bio_algorithm.h"
 #include "fpc_private.h"
 #include "fpsensor.h"
+#include "fpsensor_utils.h"
 #include "gpio.h"
 #include "link_defs.h"
 #include "spi.h"
@@ -20,9 +21,6 @@
 
 #include <sys/types.h>
 
-#define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
-#define CPRINTS(format, args...) cprints(CC_FP, format, ##args)
-
 /* Minimum reset duration */
 #define FP_SENSOR_RESET_DURATION_US (10 * MSEC)
 /* Maximum delay for the interrupt to be asserted after the sensor is reset */
diff --git a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c
index a856e0afaf..a15a8bb8f6 100644
--- a/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c
+++ b/driver/fingerprint/fpc/libfp/fpc_sensor_pal.c
@@ -8,15 +8,13 @@
 #include "console.h"
 #include "fpc_sensor_pal.h"
 #include "fpsensor.h"
+#include "fpsensor_utils.h"
 #include "shared_mem.h"
 #include "spi.h"
 #include "timer.h"
 #include "uart.h"
 #include "util.h"
 
-#define CPRINTF(format, args...) cprintf(CC_FP, format, ##args)
-#define CPRINTS(format, args...) cprints(CC_FP, format, ##args)
-
 void fpc_pal_log_entry(const char *tag, int log_level, const char *format, ...)
 {
 	va_list args;