sec_touch: use IS_ENABLED macro for builtin and module config check

Bug: 140591953
Change-Id: I18b98ba7aaefdee65f715e02c4371c9660586917
Signed-off-by: Super Liu <supercjliu@google.com>

3 files changed, 13 insertions, 26 deletions

diff --git a/sec_ts.c b/sec_ts.c
index a0791e8..dc63070 100644
--- a/sec_ts.c
+++ b/sec_ts.c
@@ -1213,8 +1213,7 @@ static void sec_ts_reinit(struct sec_ts_data *ts)
 	}
 }
 
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 /* Update a state machine used to toggle control of the touch IC's motion
  * filter.
  */
@@ -2149,8 +2148,7 @@ static void sec_ts_read_event(struct sec_ts_data *ts)
 	} while (remain_event_count >= 0);
 
 	input_sync(ts->input_dev);
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	if (processed_pointer_event) {
 		heatmap_read(&ts->v4l2, ktime_to_ns(ts->timestamp));
 
@@ -2233,8 +2231,7 @@ static irqreturn_t sec_ts_irq_thread(int irq, void *ptr)
 
 	mutex_unlock(&ts->eventlock);
 
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	/* Disable the firmware motion filter during single touch */
 	update_motion_filter(ts);
 #endif
@@ -3434,8 +3431,7 @@ static int sec_ts_probe(struct spi_device *client)
 	/* init motion filter mode */
 	ts->use_default_mf = 0;
 	ts->mf_state = SEC_TS_MF_FILTERED;
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	/*
 	 * Heatmap_probe must be called before irq routine is registered,
 	 * because heatmap_read is called from the irq context.
@@ -3519,8 +3515,7 @@ static int sec_ts_probe(struct spi_device *client)
 err_register_drm_client:
 	free_irq(client->irq, ts);
 err_heatmap:
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	heatmap_remove(&ts->v4l2);
 err_irq:
 #endif
@@ -4073,8 +4068,7 @@ static int sec_ts_remove(struct spi_device *client)
 	free_irq(ts->client->irq, ts);
 	input_info(true, &ts->client->dev, "%s: irq disabled\n", __func__);
 
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	heatmap_remove(&ts->v4l2);
 #endif
 
@@ -4133,8 +4127,7 @@ static int sec_ts_remove(struct spi_device *client)
 	class_destroy(sec_class);
 #endif
 
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	kfree(ts->heatmap_buff);
 #endif
 	kfree(ts->gainTable);
diff --git a/sec_ts.h b/sec_ts.h
index 9bf45ec..8cf287a 100644
--- a/sec_ts.h
+++ b/sec_ts.h
@@ -23,8 +23,7 @@
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/input.h>
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 #include <linux/input/heatmap.h>
 #endif
 #include <linux/input/mt.h>
@@ -231,8 +230,7 @@
 #define SEC_TS_CMD_RESET_BASELINE		0x47
 #define SEC_TS_CMD_SET_CONT_REPORT		0x49
 #define SEC_TS_CMD_WRITE_NORM_TABLE		0x49
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 #define SEC_TS_CMD_HEATMAP_READ			0x4A
 #define SEC_TS_CMD_HEATMAP_ENABLE		0x4B
 #endif
@@ -646,8 +644,7 @@ enum motion_filter_state_t {
 	SEC_TS_MF_FILTERED_LOCKED  = 2
 };
 
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 /* Local heatmap */
 #define LOCAL_HEATMAP_WIDTH 7
 #define LOCAL_HEATMAP_HEIGHT 7
@@ -865,8 +862,7 @@ struct sec_ts_data {
 	ktime_t mf_downtime;
 
 	u8 frame_type;
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	struct v4l2_heatmap v4l2;
 	strength_t *heatmap_buff;
 #endif
diff --git a/sec_ts_fn.c b/sec_ts_fn.c
index 52ea692..2e8049a 100644
--- a/sec_ts_fn.c
+++ b/sec_ts_fn.c
@@ -944,8 +944,7 @@ static ssize_t heatmap_mode_store(struct device *dev,
 				struct device_attribute *attr,
 				const char *buf, size_t count)
 {
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	struct sec_cmd_data *sec = dev_get_drvdata(dev);
 	struct sec_ts_data *ts = container_of(sec, struct sec_ts_data, sec);
 	struct sec_ts_plat_data *pdata = ts->plat_data;
@@ -987,8 +986,7 @@ static ssize_t heatmap_mode_store(struct device *dev,
 static ssize_t heatmap_mode_show(struct device *dev,
 			       struct device_attribute *attr, char *buf)
 {
-#if defined(CONFIG_TOUCHSCREEN_HEATMAP) || \
-	defined(CONFIG_TOUCHSCREEN_HEATMAP_MODULE)
+#if IS_ENABLED(CONFIG_TOUCHSCREEN_HEATMAP)
 	struct sec_cmd_data *sec = dev_get_drvdata(dev);
 	struct sec_ts_data *ts = container_of(sec, struct sec_ts_data, sec);
 	const struct sec_ts_plat_data *pdata = ts->plat_data;