Merge tag 'mac80211-next-for-davem-2015-08-14' into next

[firefly-linux-kernel-4.4.55.git] / drivers / input / ff-memless.c

diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index 74c0d8c6002aca6f74957c7f3a596f63e550199c..fcc6c3368182b9c376c01a4506d60a276dbceb1a 100644 (file)
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -237,6 +237,18 @@ static u16 ml_calculate_direction(u16 direction, u16 force,
                (force + new_force)) << 1;
 }
 
+#define FRAC_N 8
+static inline s16 fixp_new16(s16 a)
+{
+       return ((s32)a) >> (16 - FRAC_N);
+}
+
+static inline s16 fixp_mult(s16 a, s16 b)
+{
+       a = ((s32)a * 0x100) / 0x7fff;
+       return ((s32)(a * b)) >> FRAC_N;
+}
+
 /*
  * Combine two effects and apply gain.
  */
@@ -247,7 +259,7 @@ static void ml_combine_effects(struct ff_effect *effect,
        struct ff_effect *new = state->effect;
        unsigned int strong, weak, i;
        int x, y;
-       fixp_t level;
+       s16 level;
 
        switch (new->type) {
        case FF_CONSTANT:
@@ -255,8 +267,8 @@ static void ml_combine_effects(struct ff_effect *effect,
                level = fixp_new16(apply_envelope(state,
                                        new->u.constant.level,
                                        &new->u.constant.envelope));
-               x = fixp_mult(fixp_sin(i), level) * gain / 0xffff;
-               y = fixp_mult(-fixp_cos(i), level) * gain / 0xffff;
+               x = fixp_mult(fixp_sin16(i), level) * gain / 0xffff;
+               y = fixp_mult(-fixp_cos16(i), level) * gain / 0xffff;
                /*
                 * here we abuse ff_ramp to hold x and y of constant force
                 * If in future any driver wants something else than x and y