Messages in this thread Patch in this message |  | | | Subject | [PATCH 09/10] input: ff-memless.c use clamp_val() macro | | From | Harvey Harrison <> | | Date | Thu, 13 Mar 2008 22:21:34 -0700 | |
Replace two opencoded nested min/max macros with clamp_val().
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
drivers/input/ff-memless.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index d226d93..6790e97 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -247,9 +247,9 @@ static void ml_combine_effects(struct ff_effect *effect,
* in s8, this should be changed to something more generic
*/
effect->u.ramp.start_level =
- max(min(effect->u.ramp.start_level + x, 0x7f), -0x80);
+ clamp_val(effect->u.ramp.start_level + x, -0x80, 0x7f);
effect->u.ramp.end_level =
- max(min(effect->u.ramp.end_level + y, 0x7f), -0x80);
+ clamp_val(effect->u.ramp.end_level + y, -0x80, 0x7f);
break;
case FF_RUMBLE:
--
1.5.4.4.653.g7cf1e
|  |