From 7016c7d9cf8a4dd6057054ebd9b326f0bdb7d4b9 Mon Sep 17 00:00:00 2001 From: Wen Xie Date: Thu, 14 Feb 2019 18:45:59 +0800 Subject: [PATCH] haptic: revert update aw8624 vibrator driver Kernel panic: So revert "(CR): haptic: update aw8624 vibrator driver" This reverts commit e9324b897bee9f301f91d46e95401342c9410142. Change-Id: Ibc944b4a5a4427a13cc30384f94e376be75b0abd Reviewed-on: https://gerrit.mot.com/1308803 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- drivers/misc/awinic/aw8624/aw8624.c | 12 +----------- drivers/misc/awinic/aw8624/aw8624.h | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/misc/awinic/aw8624/aw8624.c b/drivers/misc/awinic/aw8624/aw8624.c index 284bc00fd495..2211da964b66 100644 --- a/drivers/misc/awinic/aw8624/aw8624.c +++ b/drivers/misc/awinic/aw8624/aw8624.c @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include "aw8624.h" #include "aw8624_reg.h" @@ -40,7 +38,7 @@ ******************************************************/ #define AW8624_I2C_NAME "aw8624_haptic" #define AW8624_HAPTIC_NAME "aw8624_haptic" -#define AW8624_VERSION "v1.0.5" +#define AW8624_VERSION "v1.0.4" #define AWINIC_RAM_UPDATE_DELAY #define AW_I2C_RETRIES 2 #define AW_I2C_RETRY_DELAY 2 @@ -2339,13 +2337,6 @@ static void aw8624_vibrator_work_routine(struct work_struct *work) hrtimer_start(&aw8624->timer, ktime_set(aw8624->duration / 1000, (aw8624->duration % 1000) * 1000000), HRTIMER_MODE_REL); - wake_lock(&aw8624->wk_lock); - aw8624->wk_lock_flag = 1; - } else { - if (aw8624->wk_lock_flag == 1) { - wake_unlock(&aw8624->wk_lock); - aw8624->wk_lock_flag = 0; - } } mutex_unlock(&aw8624->lock); @@ -2724,7 +2715,6 @@ static int aw8624_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id * aw8624->dev = &i2c->dev; aw8624->i2c = i2c; - wake_lock_init(&aw8624->wk_lock, WAKE_LOCK_SUSPEND, "aw8624_wakelock"); i2c_set_clientdata(i2c, aw8624); diff --git a/drivers/misc/awinic/aw8624/aw8624.h b/drivers/misc/awinic/aw8624/aw8624.h index 8f6b3a4fb5b1..0b6163df209f 100644 --- a/drivers/misc/awinic/aw8624/aw8624.h +++ b/drivers/misc/awinic/aw8624/aw8624.h @@ -164,8 +164,6 @@ struct aw8624 { struct device *dev; struct mutex lock; - struct wake_lock wk_lock; - unsigned char wk_lock_flag; struct hrtimer timer; struct work_struct vibrator_work; struct work_struct irq_work;