From 6fbd18d1d54ee06fdf618056bf3b0742a2b0851d Mon Sep 17 00:00:00 2001 From: liujian24 Date: Thu, 24 Sep 2020 09:19:24 +0800 Subject: [PATCH] Capri:Add compability of chipone driver WHY: Chipone fps driver should be working on different Android version WHAT:Add compability support in chipone driver Change-Id: Ic3d3cf0fafd11b5dbd600170ca0044bc4c70b3a9 Reviewed-on: https://gerrit.mot.com/1758615 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: liujian Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- drivers/input/misc/chipone_fps_mmi/fpsensor_spi_tee.c | 4 ++-- drivers/input/misc/chipone_fps_mmi/fpsensor_wakelock.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/input/misc/chipone_fps_mmi/fpsensor_spi_tee.c b/drivers/input/misc/chipone_fps_mmi/fpsensor_spi_tee.c index 0e2491b0951c..e966cb7fc374 100644 --- a/drivers/input/misc/chipone_fps_mmi/fpsensor_spi_tee.c +++ b/drivers/input/misc/chipone_fps_mmi/fpsensor_spi_tee.c @@ -631,7 +631,7 @@ static int fpsensor_probe(struct platform_device *pdev) } init_waitqueue_head(&fpsensor_dev->wq_irq_return); #if FPSENSOR_WAKEUP_TYPE == FPSENSOR_WAKEUP_SOURCE - wakeup_source_init(&g_ttw_wl, "fpsensor_ttw_wl"); + wakeup_source_init_internal(&g_ttw_wl, "fpsensor_ttw_wl"); #else wake_lock_init(&g_ttw_wl, WAKE_LOCK_SUSPEND, "fpsensor_ttw_wl"); #endif @@ -667,7 +667,7 @@ static int fpsensor_remove(struct platform_device *pdev) fpsensor_gpio_free(fpsensor_dev); fpsensor_dev_cleanup(fpsensor_dev); #if FPSENSOR_WAKEUP_TYPE == FPSENSOR_WAKEUP_SOURCE - wakeup_source_trash(&g_ttw_wl); + wakeup_source_trash_internal(&g_ttw_wl); #else wake_lock_destroy(&g_ttw_wl); #endif diff --git a/drivers/input/misc/chipone_fps_mmi/fpsensor_wakelock.h b/drivers/input/misc/chipone_fps_mmi/fpsensor_wakelock.h index 312a33650b55..f588b585e9f6 100644 --- a/drivers/input/misc/chipone_fps_mmi/fpsensor_wakelock.h +++ b/drivers/input/misc/chipone_fps_mmi/fpsensor_wakelock.h @@ -34,7 +34,7 @@ struct wake_lock { struct wakeup_source ws; }; -static inline void wakeup_source_init(struct wakeup_source *ws, +static inline void wakeup_source_init_internal(struct wakeup_source *ws, const char *name) { if(ws){ @@ -47,10 +47,10 @@ static inline void wakeup_source_init(struct wakeup_source *ws, static inline void wake_lock_init(struct wake_lock *lock, int type, const char *name) { - wakeup_source_init(&lock->ws, name); + wakeup_source_init_internal(&lock->ws, name); } -static inline void wakeup_source_trash(struct wakeup_source *ws) +static inline void wakeup_source_trash_internal(struct wakeup_source *ws) { wakeup_source_remove(ws); if(!ws) @@ -60,7 +60,7 @@ static inline void wakeup_source_trash(struct wakeup_source *ws) static inline void wake_lock_destroy(struct wake_lock *lock) { - wakeup_source_trash(&lock->ws); + wakeup_source_trash_internal(&lock->ws); } static inline void wake_lock(struct wake_lock *lock)