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-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

focaltech_0_flash: fix bld error due to wakeup API changes

Browse source 
On latest 4.19 kernel update, wakeup_source_init API was removed.
So replacing it as follows:

- wakeup_source_init => wakeup_source_register

Also, ensure wake_source_register is compatible with all kernels.

NO_PROP_NEEDED: <only applies to bo>

Change-Id: Ic08fa612c3aa8adec0e2f485c9aa85e3a8eacdf1
Reviewed-on: https://gerrit.mot.com/1699262
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 16:46:30 -03:00 • committed by Gilberto Gambugge Neto
commit dc5c7eb474
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
drivers/input/touchscreen/focaltech_0flash_mmi/focaltech_gesture.c
View file

@ -101,7 +101,7 @@ static struct fts_gesture_st fts_gesture_data;
#ifdef CONFIG_HAS_WAKELOCK
static struct wake_lock gesture_wakelock;
#else
static struct wakeup_source gesture_wakelock;
static struct wakeup_source *gesture_wakelock;
#endif
static struct sensors_classdev __maybe_unused sensors_touch_cdev = {
.name = "dt-gesture",
@ -340,7 +340,7 @@ static void fts_gesture_report(struct input_dev *input_dev, int gesture_id)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_timeout(&gesture_wakelock, msecs_to_jiffies(5000));
#else
__pm_wakeup_event(&gesture_wakelock, 5000);
__pm_wakeup_event(gesture_wakelock, 5000);
#endif
}
#else
@ -651,7 +651,15 @@ int fts_gesture_init(struct fts_ts_data *ts_data)
#ifdef CONFIG_HAS_WAKELOCK
wake_lock_init(&gesture_wakelock, WAKE_LOCK_SUSPEND, "poll-wake-lock");
#else
wakeup_source_init(&gesture_wakelock, "ets_wake_lock");
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 110))
gesture_wakelock = wakeup_source_register(ts_data->dev, "poll-wake-lock");
#else
gesture_wakelock = wakeup_source_register("poll-wake-lock");
#endif
if (!gesture_wakelock) {
FTS_ERROR("failed to allocate wakeup source\n");
return -ENOMEM;
}
#endif
#ifndef CONFIG_INPUT_TOUCHSCREEN_MMI
if (!fts_sensor_init(ts_data))