From e411bffd23872dd86615e58579c6dfd5fefc9fb6 Mon Sep 17 00:00:00 2001 From: kalathik Date: Wed, 19 Aug 2020 19:35:51 +0530 Subject: [PATCH] touch: ilitek: Replace wakeup_source API with macro Use common mmi_wake_lock macros instead directly using kernel API, which is version specific. Change-Id: I0f8263d8a4b9bd7e32b6821550ec6a7731fec7ac Signed-off-by: Kanagarathina Kalathi Reviewed-on: https://gerrit.mot.com/1727578 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Vijayakumar Gn Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- drivers/input/touchscreen/ili9882_mmi/ili9882.c | 12 +++++++----- drivers/input/touchscreen/ili9882_mmi/ili9882.h | 1 + .../input/touchscreen/ilitek_0flash_mmi/ilitek.c | 14 ++++++++------ .../input/touchscreen/ilitek_0flash_mmi/ilitek.h | 1 + 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.c b/drivers/input/touchscreen/ili9882_mmi/ili9882.c index d259c557320a..a1d49ffa2b52 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.c +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.c @@ -651,7 +651,7 @@ int ili_report_handler(void) ili_wq_ctrl(WQ_BAT, DISABLE); if (ilits->actual_tp_mode == P5_X_FW_GESTURE_MODE) { - __pm_stay_awake(ilits->ws); + PM_STAY_AWAKE(ilits->ws); if (ilits->pm_suspend) { /* Waiting for pm resume completed */ @@ -760,7 +760,7 @@ out: } if (ilits->actual_tp_mode == P5_X_FW_GESTURE_MODE) - __pm_relax(ilits->ws); + PM_RELAX(ilits->ws); return ret; } @@ -1010,9 +1010,11 @@ int ili_tddi_init(void) ilits->boot = true; #endif - ilits->ws = wakeup_source_register("ili_wakelock"); - if (!ilits->ws) + PM_WAKEUP_REGISTER(NULL, ilits->ws, "ili_wakelock"); + if (!ilits->ws) { ILI_ERR("wakeup source request failed\n"); + return -ENOMEM; + } return 0; } @@ -1039,7 +1041,7 @@ void ili_dev_remove(void) } if (ilits->ws) - wakeup_source_unregister(ilits->ws); + PM_WAKEUP_UNREGISTER(ilits->ws); kfree(ilits->tr_buf); kfree(ilits->gcoord); diff --git a/drivers/input/touchscreen/ili9882_mmi/ili9882.h b/drivers/input/touchscreen/ili9882_mmi/ili9882.h index 3e4247d3bf76..689e77a257a6 100755 --- a/drivers/input/touchscreen/ili9882_mmi/ili9882.h +++ b/drivers/input/touchscreen/ili9882_mmi/ili9882.h @@ -106,6 +106,7 @@ #include "mt_spi.h" #include "sync_write.h" #endif +#include #define DRIVER_VERSION "3.0.3.0.200610" diff --git a/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.c b/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.c index 122e5823875b..fda767b5e2b8 100644 --- a/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.c +++ b/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.c @@ -667,7 +667,7 @@ int ili_report_handler(void) ili_wq_ctrl(WQ_BAT, DISABLE); if (ilits->actual_tp_mode == P5_X_FW_GESTURE_MODE) { - __pm_stay_awake(ilits->ws); + PM_STAY_AWAKE(ilits->ws); if (ilits->pm_suspend) { /* Waiting for pm resume completed */ @@ -763,7 +763,7 @@ out: } if (ilits->actual_tp_mode == P5_X_FW_GESTURE_MODE) - __pm_relax(ilits->ws); + PM_RELAX(ilits->ws); return ret; } @@ -1006,9 +1006,11 @@ int ili_tddi_init(void) ilits->boot = true; #endif - ilits->ws = wakeup_source_register("ili_wakelock"); - if (!ilits->ws) + PM_WAKEUP_REGISTER(NULL, ilits->ws, "ili_wakelock"); + if (!ilits->ws) { ILI_ERR("wakeup source request failed\n"); + return -ENOMEM; + } return 0; } @@ -1035,7 +1037,7 @@ void ili_dev_remove(void) } if (ilits->ws) - wakeup_source_unregister(ilits->ws); + PM_WAKEUP_UNREGISTER(ilits->ws); if (ilits->charger_notif.notifier_call) power_supply_unreg_notifier(&ilits->charger_notif); @@ -1069,7 +1071,7 @@ void ilitek_spi_shutdown(struct spi_device *spi) } if (ilits->ws) - wakeup_source_unregister(ilits->ws); + PM_WAKEUP_UNREGISTER(ilits->ws); ilits->gesture = DISABLE; diff --git a/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.h b/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.h index 193443f57b7a..8376aedb1b05 100644 --- a/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.h +++ b/drivers/input/touchscreen/ilitek_0flash_mmi/ilitek.h @@ -112,6 +112,7 @@ #ifdef ILI_CONFIG_PANEL_NOTIFICATIONS #include #endif +#include #define DRIVER_VERSION "3.0.2.0.200512"