diff options
| author | Hridya Valsaraju <hridya@google.com> | 2020-04-23 20:52:37 -0700 |
|---|---|---|
| committer | Hridya Valsaraju <hridya@google.com> | 2020-04-24 04:06:19 +0000 |
| commit | 7f68fd6169c6fc975d17900fdcc538945851e069 (patch) | |
| tree | c94310a83a239ae3cba8a465722e613aa4b3c92c /fts.c | |
| parent | 59395751579f9959fb2f5abc59a3ee8d90482c83 (diff) | |
| download | fts_touch-7f68fd6169c6fc975d17900fdcc538945851e069.tar.gz | |
GKI: touch: fts: Enable modularization of the touch bus negotiator driver
These changes are required for the touch bus negotiator driver to work
correctly when CONFIG_TOUCHSCREEN_TBN=m.
Test: build, boot, touch works, tapping phone to check notification
works.
Bug: 154089962
Change-Id: I338fdcd9e82d7d787193042c6bb6268958bd89ce
Signed-off-by: Hridya Valsaraju <hridya@google.com>
Diffstat (limited to 'fts.c')
| -rw-r--r-- | fts.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4889,7 +4889,7 @@ static void fts_resume_work(struct work_struct *work) if (!info->sensor_sleep) return; -#ifdef CONFIG_TOUCHSCREEN_TBN +#if IS_ENABLED(CONFIG_TOUCHSCREEN_TBN) if (info->tbn) tbn_request_bus(info->tbn); #endif @@ -4953,7 +4953,7 @@ static void fts_suspend_work(struct work_struct *work) fts_set_switch_gpio(info, FTS_SWITCH_GPIO_VALUE_SLPI_MASTER); -#ifdef CONFIG_TOUCHSCREEN_TBN +#if IS_ENABLED(CONFIG_TOUCHSCREEN_TBN) if (info->tbn) tbn_release_bus(info->tbn); #endif @@ -5566,7 +5566,7 @@ static int fts_probe(struct spi_device *client) dev_set_drvdata(info->dev, info); -#ifdef CONFIG_TOUCHSCREEN_TBN +#if IS_ENABLED(CONFIG_TOUCHSCREEN_TBN) info->tbn = tbn_init(info->dev); if (!info->tbn) { pr_err("ERROR: failed to init tbn context\n"); @@ -5938,7 +5938,7 @@ static int fts_remove(struct spi_device *client) pr_info("%s\n", __func__); -#ifdef CONFIG_TOUCHSCREEN_TBN +#if IS_ENABLED(CONFIG_TOUCHSCREEN_TBN) tbn_cleanup(info->tbn); #endif |