UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Input: regulator-haptic - simplify code 

All the use cases in this driver has a regulator_haptic_toggle() call after
regulator_haptic_set_voltage(). So make regulator_haptic_set_voltage() call
regulator_haptic_toggle() to simplify the code.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
This commit is contained in:
Axel Lin 2015-01-09 17:43:06 -08:00 committed by Dmitry Torokhov
parent f17effbe89
commit 3cb6dcfa44
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/input/misc/regulator-haptic.c
View File

@ -76,6 +76,8 @@ static int regulator_haptic_set_voltage(struct regulator_haptic *haptic,
return error; return error;
} }
regulator_haptic_toggle(haptic, !!magnitude);
return 0; return 0;
} }
@ -83,23 +85,12 @@ static void regulator_haptic_work(struct work_struct *work)
{ {
struct regulator_haptic *haptic = container_of(work, struct regulator_haptic *haptic = container_of(work,
struct regulator_haptic, work); struct regulator_haptic, work);
unsigned int magnitude;
int error;
mutex_lock(&haptic->mutex); mutex_lock(&haptic->mutex);
if (haptic->suspended) if (!haptic->suspended)
goto out; regulator_haptic_set_voltage(haptic, haptic->magnitude);
magnitude = ACCESS_ONCE(haptic->magnitude);
error = regulator_haptic_set_voltage(haptic, magnitude);
if (error)
goto out;
regulator_haptic_toggle(haptic, magnitude != 0);
out:
mutex_unlock(&haptic->mutex); mutex_unlock(&haptic->mutex);
} }
@ -123,7 +114,6 @@ static void regulator_haptic_close(struct input_dev *input)
cancel_work_sync(&haptic->work); cancel_work_sync(&haptic->work);
regulator_haptic_set_voltage(haptic, 0); regulator_haptic_set_voltage(haptic, 0);
regulator_haptic_toggle(haptic, false);
} }
static int __maybe_unused static int __maybe_unused
@ -225,7 +215,6 @@ static int __maybe_unused regulator_haptic_suspend(struct device *dev)
return error; return error;
regulator_haptic_set_voltage(haptic, 0); regulator_haptic_set_voltage(haptic, 0);
regulator_haptic_toggle(haptic, false);
haptic->suspended = true; haptic->suspended = true;
@ -245,10 +234,8 @@ static int __maybe_unused regulator_haptic_resume(struct device *dev)
haptic->suspended = false; haptic->suspended = false;
magnitude = ACCESS_ONCE(haptic->magnitude); magnitude = ACCESS_ONCE(haptic->magnitude);
if (magnitude) { if (magnitude)
regulator_haptic_set_voltage(haptic, magnitude); regulator_haptic_set_voltage(haptic, magnitude);
regulator_haptic_toggle(haptic, true);
}
mutex_unlock(&haptic->mutex); mutex_unlock(&haptic->mutex);