A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 07:37:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

ets_fps: fix build error due to changes in the wakeup API

Browse source 
On latest 4.19 kernel update, wakeup_source_init and wake_source_trash APIs
were removed. So, replacing them as follows:

- wakeup_source_init => wakeup_source_register
- wakeup_source_trash => wakeup_source_unregister

Also, ensure wake_source_register is compatible with all kernels.

NO_PROP_NEEDED: <only applies to bo>

Change-Id: I35d73705252d23aedc2eb6b9ad4dcede0e451f35
Reviewed-on: https://gerrit.mot.com/1699260
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Ling Jin <lingjin@motorola.com>
Submit-Approved: Sergio Vilela <sv008@motorola.com>
This commit is contained in:
Gilberto Gambugge 2020-07-21 15:36:35 -03:00 • committed by Gilberto Gambugge Neto
commit 46cb523d95
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
drivers/input/misc/ets_fps_mmi/ets_fps.c
View file

@ -50,6 +50,8 @@
#include <linux/pm_wakeup.h>
#endif
#include <linux/version.h>
#include "ets_fps.h"
#include "ets_navi_input.h"
@ -65,7 +67,7 @@
#ifdef CONFIG_HAS_WAKELOCK
static struct wake_lock ets_wake_lock;
#else
static struct wakeup_source ets_wake_lock;
static struct wakeup_source *ets_wake_lock;
#endif
/*
* FPS interrupt table
@ -258,7 +260,7 @@ static irqreturn_t fp_eint_func(int irq, void *dev_id)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_timeout(&ets_wake_lock, msecs_to_jiffies(1500));
#else
__pm_wakeup_event(&ets_wake_lock, 1500);
__pm_wakeup_event(ets_wake_lock, 1500);
#endif
#ifdef CONFIG_DISPLAY_SPEED_UP
if (is_auth_ready) {
@ -282,7 +284,7 @@ static irqreturn_t fp_eint_func_ll(int irq, void *dev_id)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_timeout(&ets_wake_lock, msecs_to_jiffies(1500));
#else
__pm_wakeup_event(&ets_wake_lock, 1500);
__pm_wakeup_event(ets_wake_lock, 1500);
#endif
return IRQ_RETVAL(IRQ_HANDLED);
}
@ -968,7 +970,7 @@ static int etspi_remove(struct platform_device *pdev)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_destroy(&ets_wake_lock);
#else
wakeup_source_trash(&ets_wake_lock);
wakeup_source_unregister(ets_wake_lock);
#endif
del_timer_sync(&fps_ints.timer);
etspi_create_device(etspi, false);
@ -1050,7 +1052,16 @@ static int etspi_probe(struct platform_device *pdev)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_init(&ets_wake_lock, WAKE_LOCK_SUSPEND, "ets_wake_lock");
#else
wakeup_source_init(&ets_wake_lock, "ets_wake_lock");
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 110))
ets_wake_lock = wakeup_source_register(dev, "ets_wake_lock");
#else
ets_wake_lock = wakeup_source_register("ets_wake_lock");
#endif
if (!ets_wake_lock) {
pr_err("%s : failed to allocate wakeup source\n", __func__);
status = -ENOMEM;
goto etspi_register_wake_lock_failed;
}
#endif
DEBUG_PRINT(" add_timer ---- \n");
DEBUG_PRINT("%s : initialize success %d\n",
@ -1076,7 +1087,10 @@ etspi_create_group_failed:
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_destroy(&ets_wake_lock);
#else
wakeup_source_trash(&ets_wake_lock);
wakeup_source_unregister(ets_wake_lock);
#endif
#ifndef CONFIG_HAS_WAKELOCK
etspi_register_wake_lock_failed:
#endif
del_timer_sync(&fps_ints.timer);
etspi_create_device(etspi, false);