This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / input / joystick / iforce / iforce-ff.c

diff --git a/drivers/input/joystick/iforce/iforce-ff.c b/drivers/input/joystick/iforce/iforce-ff.c
index 267f92f..2b8e845 100644 (file)
--- a/drivers/input/joystick/iforce/iforce-ff.c
+++ b/drivers/input/joystick/iforce/iforce-ff.c
@@ -42,14 +42,14 @@ static int make_magnitude_modifier(struct iforce* iforce,
        unsigned char data[3];
 
        if (!no_alloc) {
-               down(&iforce->mem_mutex);
+               mutex_lock(&iforce->mem_mutex);
                if (allocate_resource(&(iforce->device_memory), mod_chunk, 2,
                        iforce->device_memory.start, iforce->device_memory.end, 2L,
                        NULL, NULL)) {
-                       up(&iforce->mem_mutex);
+                       mutex_unlock(&iforce->mem_mutex);
                        return -ENOMEM;
                }
-               up(&iforce->mem_mutex);
+               mutex_unlock(&iforce->mem_mutex);
        }
 
        data[0] = LO(mod_chunk->start);
@@ -75,14 +75,14 @@ static int make_period_modifier(struct iforce* iforce,
        period = TIME_SCALE(period);
 
        if (!no_alloc) {
-               down(&iforce->mem_mutex);
+               mutex_lock(&iforce->mem_mutex);
                if (allocate_resource(&(iforce->device_memory), mod_chunk, 0x0c,
                        iforce->device_memory.start, iforce->device_memory.end, 2L,
                        NULL, NULL)) {
-                       up(&iforce->mem_mutex);
+                       mutex_unlock(&iforce->mem_mutex);
                        return -ENOMEM;
                }
-               up(&iforce->mem_mutex);
+               mutex_unlock(&iforce->mem_mutex);
        }
 
        data[0] = LO(mod_chunk->start);
@@ -115,14 +115,14 @@ static int make_envelope_modifier(struct iforce* iforce,
        fade_duration = TIME_SCALE(fade_duration);
 
        if (!no_alloc) {
-               down(&iforce->mem_mutex);
+               mutex_lock(&iforce->mem_mutex);
                if (allocate_resource(&(iforce->device_memory), mod_chunk, 0x0e,
                        iforce->device_memory.start, iforce->device_memory.end, 2L,
                        NULL, NULL)) {
-                       up(&iforce->mem_mutex);
+                       mutex_unlock(&iforce->mem_mutex);
                        return -ENOMEM;
                }
-               up(&iforce->mem_mutex);
+               mutex_unlock(&iforce->mem_mutex);
        }
 
        data[0] = LO(mod_chunk->start);
@@ -152,14 +152,14 @@ static int make_condition_modifier(struct iforce* iforce,
        unsigned char data[10];
 
        if (!no_alloc) {
-               down(&iforce->mem_mutex);
+               mutex_lock(&iforce->mem_mutex);
                if (allocate_resource(&(iforce->device_memory), mod_chunk, 8,
                        iforce->device_memory.start, iforce->device_memory.end, 2L,
                        NULL, NULL)) {
-                       up(&iforce->mem_mutex);
+                       mutex_unlock(&iforce->mem_mutex);
                        return -ENOMEM;
                }
-               up(&iforce->mem_mutex);
+               mutex_unlock(&iforce->mem_mutex);
        }
 
        data[0] = LO(mod_chunk->start);
@@ -195,7 +195,7 @@ static unsigned char find_button(struct iforce *iforce, signed short button)
 }
 
 /*
- * Analyse the changes in an effect, and tell if we need to send an condition 
+ * Analyse the changes in an effect, and tell if we need to send an condition
  * parameter packet
  */
 static int need_condition_modifier(struct iforce* iforce, struct ff_effect* new)
@@ -372,7 +372,7 @@ int iforce_upload_periodic(struct iforce* iforce, struct ff_effect* effect, int
        int core_err = 0;
 
        if (!is_update || need_period_modifier(iforce, effect)) {
-               param1_err = make_period_modifier(iforce, mod1_chunk, 
+               param1_err = make_period_modifier(iforce, mod1_chunk,
                        is_update,
                        effect->u.periodic.magnitude, effect->u.periodic.offset,
                        effect->u.periodic.period, effect->u.periodic.phase);